Compare commits
12 Commits
6d5e2b62cb
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 5c9c83a7bc | |||
| 655e1b4760 | |||
| d6f050f812 | |||
| 0a2e95ebfc | |||
| f68a9bbf8f | |||
| a5069ff17c | |||
| 541c5d4d2c | |||
| 01d6e223a2 | |||
| 014030c97b | |||
| 00dea62a52 | |||
| ebcbe88771 | |||
| 35ad55b434 |
@@ -0,0 +1,25 @@
|
|||||||
|
[font]
|
||||||
|
size = 12
|
||||||
|
|
||||||
|
[font.normal]
|
||||||
|
family = "Iosevka"
|
||||||
|
style = "Regular"
|
||||||
|
|
||||||
|
[scrolling]
|
||||||
|
history = 10000
|
||||||
|
multiplier = 3
|
||||||
|
|
||||||
|
[selection]
|
||||||
|
save_to_clipboard = false
|
||||||
|
|
||||||
|
[window]
|
||||||
|
opacity = 0.85
|
||||||
|
|
||||||
|
[window.padding]
|
||||||
|
x = 10
|
||||||
|
y = 10
|
||||||
|
|
||||||
|
[general]
|
||||||
|
import = ["./catppuccin-mocha.toml"]
|
||||||
|
|
||||||
|
[terminal]
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
[[colors.indexed_colors]]
|
||||||
|
color = "#FAB387"
|
||||||
|
index = 16
|
||||||
|
|
||||||
|
[[colors.indexed_colors]]
|
||||||
|
color = "#F5E0DC"
|
||||||
|
index = 17
|
||||||
|
|
||||||
|
[colors.bright]
|
||||||
|
black = "#585B70"
|
||||||
|
blue = "#89B4FA"
|
||||||
|
cyan = "#94E2D5"
|
||||||
|
green = "#A6E3A1"
|
||||||
|
magenta = "#F5C2E7"
|
||||||
|
red = "#F38BA8"
|
||||||
|
white = "#A6ADC8"
|
||||||
|
yellow = "#F9E2AF"
|
||||||
|
|
||||||
|
[colors.cursor]
|
||||||
|
cursor = "#F5E0DC"
|
||||||
|
text = "#1E1E2E"
|
||||||
|
|
||||||
|
[colors.dim]
|
||||||
|
black = "#45475A"
|
||||||
|
blue = "#89B4FA"
|
||||||
|
cyan = "#94E2D5"
|
||||||
|
green = "#A6E3A1"
|
||||||
|
magenta = "#F5C2E7"
|
||||||
|
red = "#F38BA8"
|
||||||
|
white = "#BAC2DE"
|
||||||
|
yellow = "#F9E2AF"
|
||||||
|
|
||||||
|
[colors.hints.end]
|
||||||
|
background = "#A6ADC8"
|
||||||
|
foreground = "#1E1E2E"
|
||||||
|
|
||||||
|
[colors.hints.start]
|
||||||
|
background = "#F9E2AF"
|
||||||
|
foreground = "#1E1E2E"
|
||||||
|
|
||||||
|
[colors.normal]
|
||||||
|
black = "#45475A"
|
||||||
|
blue = "#89B4FA"
|
||||||
|
cyan = "#94E2D5"
|
||||||
|
green = "#A6E3A1"
|
||||||
|
magenta = "#F5C2E7"
|
||||||
|
red = "#F38BA8"
|
||||||
|
white = "#BAC2DE"
|
||||||
|
yellow = "#F9E2AF"
|
||||||
|
|
||||||
|
[colors.primary]
|
||||||
|
background = "#1E1E2E"
|
||||||
|
bright_foreground = "#CDD6F4"
|
||||||
|
dim_foreground = "#CDD6F4"
|
||||||
|
foreground = "#CDD6F4"
|
||||||
|
|
||||||
|
[colors.search.focused_match]
|
||||||
|
background = "#A6E3A1"
|
||||||
|
foreground = "#1E1E2E"
|
||||||
|
|
||||||
|
[colors.search.matches]
|
||||||
|
background = "#A6ADC8"
|
||||||
|
foreground = "#1E1E2E"
|
||||||
|
|
||||||
|
[colors.selection]
|
||||||
|
background = "#F5E0DC"
|
||||||
|
text = "#1E1E2E"
|
||||||
|
|
||||||
|
[colors.vi_mode_cursor]
|
||||||
|
cursor = "#B4BEFE"
|
||||||
|
text = "#1E1E2E"
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
;;"GNU Emacs 30.2 (build 2, x86_64-pc-linux-gnu, GTK+ Version 3.24.50, cairo version 1.18.4)"
|
||||||
|
(setq-local uconf-font-name "Iosevka")
|
||||||
|
(setq custom-file (file-name-concat (file-name-directory user-init-file) "custom.el"))
|
||||||
|
(setq inhibit-startup-screen t)
|
||||||
|
(setq display-line-numbers-type 'relative)
|
||||||
|
|
||||||
|
(menu-bar-mode 0)
|
||||||
|
(tool-bar-mode 0)
|
||||||
|
(global-display-line-numbers-mode)
|
||||||
|
(ido-mode 1)
|
||||||
|
(ido-everywhere 1)
|
||||||
|
(fido-mode 1)
|
||||||
|
(show-paren-mode 1)
|
||||||
|
(column-number-mode 1)
|
||||||
|
(whitespace-mode 1)
|
||||||
|
|
||||||
|
(keymap-global-set "C-." 'other-window)
|
||||||
|
(keymap-global-set "C-c c" 'compile)
|
||||||
|
(keymap-global-set "C-c C-c" 'recompile)
|
||||||
|
|
||||||
|
(split-window-right)
|
||||||
|
|
||||||
|
(require 'compile)
|
||||||
|
(add-to-list
|
||||||
|
'compilation-error-regexp-alist-alist
|
||||||
|
'(paren-style
|
||||||
|
"^\\([^(\n]+\\)(\\([0-9]+\\),\\([0-9]+\\)):"
|
||||||
|
1 2 3))
|
||||||
|
(add-to-list 'compilation-error-regexp-alist 'paren-style)
|
||||||
|
|
||||||
|
(defvar xdg-cache-dir
|
||||||
|
(or (getenv "XDG_CACHE_HOME")
|
||||||
|
(expand-file-name "~/.cache")))
|
||||||
|
|
||||||
|
(setq auto-save-file-name-transforms
|
||||||
|
`((".*" ,(expand-file-name "emacs/autosaves/" xdg-cache-dir) t)))
|
||||||
|
|
||||||
|
(setq backup-directory-alist
|
||||||
|
`(("." . ,(expand-file-name "emacs/backups/" xdg-cache-dir))))
|
||||||
|
|
||||||
|
(setq lock-file-name-transforms
|
||||||
|
`((".*" ,(expand-file-name "emacs/lockfiles/" xdg-cache-dir) t)))
|
||||||
|
|
||||||
|
(dolist (dir '("autosaves" "backups" "lockfiles"))
|
||||||
|
(make-directory (expand-file-name (concat "emacs/" dir) xdg-cache-dir) t))
|
||||||
|
|
||||||
|
(use-package paredit
|
||||||
|
:ensure t
|
||||||
|
:hook ((emacs-lisp-mode
|
||||||
|
lisp-mode
|
||||||
|
clojure-mode
|
||||||
|
scheme-mode
|
||||||
|
racket-mode) . paredit-mode)
|
||||||
|
:config
|
||||||
|
(setq paredit-everywhere t))
|
||||||
|
|
||||||
|
(use-package multiple-cursors
|
||||||
|
:ensure t
|
||||||
|
:bind (("C->" . mc/mark-next-like-this)
|
||||||
|
("C-S-c C-S-c" . mc/edit-lines)
|
||||||
|
("C-<" . mc/mark-previous-like-this)
|
||||||
|
("C-c C->" . mc/mark-all-like-this)))
|
||||||
|
|
||||||
|
(use-package modus-themes
|
||||||
|
:ensure t
|
||||||
|
:config
|
||||||
|
(load-theme 'modus-vivendi-tinted t))
|
||||||
|
|
||||||
|
(set-face-attribute 'default nil :height 140)
|
||||||
|
|
||||||
|
(when (find-font (font-spec
|
||||||
|
:family uconf-font-name))
|
||||||
|
(set-face-attribute 'default nil
|
||||||
|
:font uconf-font-name))
|
||||||
|
|
||||||
|
(use-package magit
|
||||||
|
:ensure t
|
||||||
|
:bind (("C-x g" . magit-status)))
|
||||||
|
|
||||||
|
(load-file custom-file)
|
||||||
@@ -0,0 +1,148 @@
|
|||||||
|
set $mod Mod4
|
||||||
|
|
||||||
|
font pango:Noto Sans 12
|
||||||
|
|
||||||
|
# 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 xsettingsd
|
||||||
|
exec --no-startup-id xfce4-clipman
|
||||||
|
# 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
|
||||||
|
|
||||||
|
# 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@ +10% && $refresh_i3status
|
||||||
|
bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $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
|
||||||
|
|
||||||
|
# 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
|
||||||
|
|
||||||
|
bindsym $mod+Return exec alacritty
|
||||||
|
|
||||||
|
bindsym $mod+q kill
|
||||||
|
|
||||||
|
bindsym $mod+b exec brave
|
||||||
|
bindsym $mod+space exec --no-startup-id "rofi -modi drun,run -show drun"
|
||||||
|
bindsym $mod+Tab exec --no-startup-id "rofi -modi window -show window"
|
||||||
|
# bindcode $mod+40 exec "rofi -modi drun,run -show drun"
|
||||||
|
|
||||||
|
# change focus
|
||||||
|
bindsym $mod+h focus left
|
||||||
|
bindsym $mod+j focus down
|
||||||
|
bindsym $mod+k focus up
|
||||||
|
bindsym $mod+l 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
|
||||||
|
|
||||||
|
# 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
|
||||||
|
bindsym $mod+Shift+Left move left
|
||||||
|
bindsym $mod+Shift+Down move down
|
||||||
|
bindsym $mod+Shift+Up move up
|
||||||
|
bindsym $mod+Shift+Right move right
|
||||||
|
|
||||||
|
# split in horizontal orientation
|
||||||
|
bindsym $mod+m split h
|
||||||
|
# split in vertical orientation
|
||||||
|
bindsym $mod+n 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+t floating toggle
|
||||||
|
|
||||||
|
# change focus between tiling / floating windows
|
||||||
|
bindsym $mod+g focus mode_toggle
|
||||||
|
|
||||||
|
floating_modifier $mod
|
||||||
|
|
||||||
|
# focus the parent container
|
||||||
|
bindsym $mod+a focus parent
|
||||||
|
|
||||||
|
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"
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
bindsym $mod+Shift+r reload
|
||||||
|
bindsym $mod+Shift+c restart
|
||||||
|
bindsym $mod+Escape 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'"
|
||||||
|
|
||||||
|
mode "resize" {
|
||||||
|
# These bindings trigger as soon as you enter the resize mode
|
||||||
|
bindsym j resize shrink width 10 px or 10 ppt
|
||||||
|
bindsym k resize grow height 10 px or 10 ppt
|
||||||
|
bindsym l resize shrink height 10 px or 10 ppt
|
||||||
|
bindsym semicolon resize grow width 10 px or 10 ppt
|
||||||
|
|
||||||
|
bindsym Left resize shrink width 10 px or 10 ppt
|
||||||
|
bindsym Down resize grow height 10 px or 10 ppt
|
||||||
|
bindsym Up resize shrink height 10 px or 10 ppt
|
||||||
|
bindsym Right resize grow width 10 px or 10 ppt
|
||||||
|
|
||||||
|
bindsym Return mode "default"
|
||||||
|
bindsym Escape mode "default"
|
||||||
|
bindsym $mod+r mode "default"
|
||||||
|
}
|
||||||
|
|
||||||
|
bindsym $mod+r mode "resize"
|
||||||
|
|
||||||
|
bar {
|
||||||
|
status_command i3status
|
||||||
|
}
|
||||||
|
|
||||||
|
default_border pixel 1
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
|
||||||
|
general {
|
||||||
|
colors = true
|
||||||
|
interval = 5
|
||||||
|
}
|
||||||
|
|
||||||
|
order += "cpu_usage"
|
||||||
|
order += "cpu_temperature 0"
|
||||||
|
order += "load"
|
||||||
|
order += "memory"
|
||||||
|
order += "disk /"
|
||||||
|
order += "wireless _first_"
|
||||||
|
order += "ethernet _first_"
|
||||||
|
order += "volume master"
|
||||||
|
order += "battery 0"
|
||||||
|
order += "time"
|
||||||
|
|
||||||
|
|
||||||
|
cpu_temperature 0 {
|
||||||
|
format = "%degrees °C"
|
||||||
|
}
|
||||||
|
|
||||||
|
time {
|
||||||
|
format = "%Y-%m-%d %H:%M:%S"
|
||||||
|
}
|
||||||
|
|
||||||
|
load {
|
||||||
|
format = "%1min"
|
||||||
|
}
|
||||||
|
|
||||||
|
memory {
|
||||||
|
format = "%used / %total (%percentage_used)"
|
||||||
|
}
|
||||||
|
|
||||||
|
disk "/" {
|
||||||
|
format = "%free / %total (%percentage_used)"
|
||||||
|
}
|
||||||
|
|
||||||
|
volume master {
|
||||||
|
format = "♪ %volume"
|
||||||
|
format_muted = "♪ %volume (muted)"
|
||||||
|
device = "default"
|
||||||
|
mixer = "Master"
|
||||||
|
mixer_idx = 0
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
wireless _first_ {
|
||||||
|
format_up = "%ip (%essid, %bitrate, %quality)"
|
||||||
|
format_down = ""
|
||||||
|
}
|
||||||
|
|
||||||
|
ethernet _first_ {
|
||||||
|
format_up = "%ip (%speed)"
|
||||||
|
format_down = ""
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
battery 0 {
|
||||||
|
format = "%status %percentage %remaining %emptytime"
|
||||||
|
format_down = ""
|
||||||
|
status_chr = "⚡"
|
||||||
|
status_bat = "🔋"
|
||||||
|
status_unk = "?"
|
||||||
|
status_full = "Full"
|
||||||
|
status_idle = "Idle"
|
||||||
|
path = "/sys/class/power_supply/BAT%d/uevent"
|
||||||
|
low_threshold = 10
|
||||||
|
}
|
||||||
|
|
||||||
|
cpu_usage {
|
||||||
|
format = "%usage"
|
||||||
|
max_threshold = 80
|
||||||
|
}
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
require 'nvim-autopairs'
|
|
||||||
.setup()
|
|
||||||
require 'better_escape'
|
|
||||||
.setup()
|
|
||||||
require 'Comment'
|
|
||||||
.setup()
|
|
||||||
|
|
||||||
local function nvim_tree_on_attach(bufnr)
|
|
||||||
local api = require'nvim-tree.api'
|
|
||||||
api.config.mappings.default_on_attach(bufnr)
|
|
||||||
local function opts(desc)
|
|
||||||
return { desc = "nvim-tree: " .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
|
|
||||||
end
|
|
||||||
local function open()
|
|
||||||
api.node.open.edit(nil, {
|
|
||||||
quit_on_open=true
|
|
||||||
})
|
|
||||||
end
|
|
||||||
vim.keymap.set('n', 'o', open, opts('Open'))
|
|
||||||
vim.keymap.set('n', '<CR>', open, opts('Open'))
|
|
||||||
end
|
|
||||||
require'nvim-tree'
|
|
||||||
.setup {
|
|
||||||
on_attach = nvim_tree_on_attach
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
local conform = require 'conform'
|
|
||||||
conform.setup {}
|
|
||||||
|
|
||||||
vim.keymap.set('n', '<Leader><Leader>', vim.cmd.so)
|
|
||||||
vim.keymap.set('n', '<Leader>e',
|
|
||||||
function()
|
|
||||||
local tree = require("nvim-tree.api").tree
|
|
||||||
tree.open({ current_window = true })
|
|
||||||
end
|
|
||||||
)
|
|
||||||
vim.keymap.set('n', '<Leader>w', vim.cmd.write)
|
|
||||||
vim.keymap.set('n', '<Leader>q', vim.cmd.quit)
|
|
||||||
vim.keymap.set('n', '<Leader>b', vim.cmd.Buffers)
|
|
||||||
vim.keymap.set('n', '<Leader>f', conform.format)
|
|
||||||
vim.keymap.set('n', '<Leader>h', vim.cmd.History)
|
|
||||||
vim.keymap.set('n', '<Leader>g', vim.cmd.Rg)
|
|
||||||
vim.keymap.set('n', '<Leader>j', vim.cmd.FZF)
|
|
||||||
vim.keymap.set('n', '<Leader>u', vim.cmd.UndotreeToggle)
|
|
||||||
vim.keymap.set('n', '<Leader>5', ':vsplit<CR>:Files<CR>')
|
|
||||||
vim.keymap.set('v', '<Leader>y', '"+y')
|
|
||||||
vim.keymap.set('n', '<Leader>y', '"+y')
|
|
||||||
vim.keymap.set('n', '<Leader>p', '"+p')
|
|
||||||
vim.keymap.set('v', '<Leader>p', '"+p')
|
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
require 'nvim-autopairs'
|
||||||
|
.setup()
|
||||||
|
require 'better_escape'
|
||||||
|
.setup()
|
||||||
|
require 'Comment'
|
||||||
|
.setup()
|
||||||
|
|
||||||
|
vim.keymap.set('n', '<Leader><Leader>', vim.cmd.so)
|
||||||
|
vim.keymap.set('n', '<Leader>e', ':Ex')
|
||||||
|
vim.keymap.set('n', '<Leader>w', vim.cmd.write)
|
||||||
|
vim.keymap.set('n', '<Leader>q', vim.cmd.quit)
|
||||||
|
vim.keymap.set('n', '<Leader>b', vim.cmd.Buffers)
|
||||||
|
vim.keymap.set('n', '<Leader>h', vim.cmd.History)
|
||||||
|
vim.keymap.set('n', '<Leader>g', vim.cmd.Rg)
|
||||||
|
vim.keymap.set('n', '<Leader>j', vim.cmd.FZF)
|
||||||
|
vim.keymap.set('n', '<Leader>u', vim.cmd.UndotreeToggle)
|
||||||
|
vim.keymap.set('n', '<Leader>5', ':vsplit<CR>:Files<CR>')
|
||||||
|
vim.keymap.set('v', '<Leader>y', '"+y')
|
||||||
|
vim.keymap.set('n', '<Leader>y', '"+y')
|
||||||
|
vim.keymap.set('n', '<Leader>p', '"+p')
|
||||||
|
vim.keymap.set('v', '<Leader>p', '"+p')
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
-- if (os.getenv('TERM_PROGRAM') == 'Apple_Terminal') then
|
|
||||||
-- vim.cmd.colorscheme('slate')
|
|
||||||
-- else
|
|
||||||
-- require 'monokai'
|
|
||||||
-- .setup()
|
|
||||||
-- end
|
|
||||||
vim.cmd.colorscheme('tokyonight-night')
|
|
||||||
require 'lualine'
|
|
||||||
.setup({
|
|
||||||
options = {
|
|
||||||
theme = 'tokyonight'
|
|
||||||
}
|
|
||||||
})
|
|
||||||
require 'highlight-undo'
|
|
||||||
.setup()
|
|
||||||
+27
-45
@@ -1,12 +1,12 @@
|
|||||||
vim.g.mapleader = ' '
|
vim.g.mapleader = ' '
|
||||||
|
|
||||||
vim.opt.shortmess:append("I")
|
vim.opt.shortmess:append('I')
|
||||||
vim.opt.nu = true
|
vim.opt.nu = true
|
||||||
vim.opt.relativenumber = true
|
vim.opt.relativenumber = true
|
||||||
vim.opt.wrap = true
|
vim.opt.wrap = true
|
||||||
vim.opt.scrolloff = 8
|
vim.opt.scrolloff = 8
|
||||||
vim.opt.laststatus = 2
|
vim.opt.laststatus = 2
|
||||||
vim.opt.colorcolumn = '80'
|
vim.opt.colorcolumn = '120'
|
||||||
vim.opt.signcolumn = 'no'
|
vim.opt.signcolumn = 'no'
|
||||||
vim.opt.tabstop = 4
|
vim.opt.tabstop = 4
|
||||||
vim.opt.softtabstop = 4
|
vim.opt.softtabstop = 4
|
||||||
@@ -22,67 +22,49 @@ vim.opt.hlsearch = true
|
|||||||
vim.opt.incsearch = true
|
vim.opt.incsearch = true
|
||||||
vim.opt.winborder = 'single'
|
vim.opt.winborder = 'single'
|
||||||
|
|
||||||
|
vim.cmd.colorscheme'habamax'
|
||||||
|
|
||||||
vim.keymap.set('v', 'K', ':m \'<-2<CR>gv=gv')
|
vim.keymap.set('v', 'K', ':m \'<-2<CR>gv=gv')
|
||||||
vim.keymap.set('v', 'J', ':m \'>+1<CR>gv=gv')
|
vim.keymap.set('v', 'J', ':m \'>+1<CR>gv=gv')
|
||||||
|
|
||||||
vim.keymap.set('n', '<C-d>', '<C-d>zz')
|
vim.keymap.set('n', '<C-d>', '<C-d>zz')
|
||||||
vim.keymap.set('n', '<C-u>', '<C-u>zz')
|
vim.keymap.set('n', '<C-u>', '<C-u>zz')
|
||||||
|
|
||||||
vim.keymap.set("n", "n", "nzzzv")
|
vim.keymap.set('n', 'n', 'nzzzv')
|
||||||
vim.keymap.set("n", "N", "Nzzzv")
|
vim.keymap.set('n', 'N', 'Nzzzv')
|
||||||
|
|
||||||
vim.diagnostic.config({
|
vim.diagnostic.config({
|
||||||
virtual_text = true,
|
virtual_text = true,
|
||||||
severity_sort = true,
|
severity_sort = true,
|
||||||
float = {
|
float = {
|
||||||
border = 'rounded',
|
border = 'single',
|
||||||
source = 'if_many',
|
source = 'if_many',
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
local Plug = vim.fn['plug#']
|
local gh = function(x) return 'https://github.com/' .. x end
|
||||||
|
|
||||||
vim.call('plug#begin')
|
vim.pack.add {
|
||||||
|
{
|
||||||
|
src=gh('junegunn/fzf'),
|
||||||
|
build = function()
|
||||||
|
vim.fn.system("./install --all")
|
||||||
|
end
|
||||||
|
},
|
||||||
|
{ src=gh('junegunn/fzf.vim')},
|
||||||
|
|
||||||
Plug('junegunn/fzf', { ['do'] = function() vim.call('fzf#install') end })
|
{ src=gh('numToStr/Comment.nvim')},
|
||||||
Plug 'junegunn/fzf.vim'
|
{ src=gh('andymass/vim-matchup')},
|
||||||
|
{ src=gh('windwp/nvim-autopairs')},
|
||||||
|
|
||||||
Plug 'nvim-lualine/lualine.nvim'
|
{ src=gh('mbbill/undotree')},
|
||||||
|
|
||||||
-- Formatter
|
{ src=gh('max397574/better-escape.nvim')},
|
||||||
Plug 'stevearc/conform.nvim'
|
|
||||||
|
|
||||||
Plug 'numToStr/Comment.nvim'
|
{ src=gh('tzachar/highlight-undo.nvim')},
|
||||||
Plug 'andymass/vim-matchup'
|
{ src=gh('folke/which-key.nvim')},
|
||||||
Plug 'windwp/nvim-autopairs'
|
{ src=gh('folke/noice.nvim')},
|
||||||
|
{ src=gh('tpope/vim-fugitive') }, -- git client
|
||||||
Plug 'mbbill/undotree'
|
{ src=gh('tpope/vim-sensible') }, -- 'sensible' vim defaults
|
||||||
|
{ src=gh('tpope/vim-vinegar') }, -- netrw changes
|
||||||
Plug 'max397574/better-escape.nvim'
|
|
||||||
|
|
||||||
Plug 'tzachar/highlight-undo.nvim'
|
|
||||||
Plug 'folke/which-key.nvim'
|
|
||||||
Plug 'folke/tokyonight.nvim'
|
|
||||||
Plug 'tanvirtin/monokai.nvim'
|
|
||||||
Plug 'folke/noice.nvim'
|
|
||||||
|
|
||||||
Plug 'nvim-tree/nvim-tree.lua'
|
|
||||||
|
|
||||||
-- tpope
|
|
||||||
Plug 'tpope/vim-fugitive' -- git client
|
|
||||||
Plug 'tpope/vim-sensible' -- "sensible" vim defaults
|
|
||||||
Plug 'tpope/vim-vinegar' -- netrw changes
|
|
||||||
vim.call('plug#end')
|
|
||||||
|
|
||||||
--[[
|
|
||||||
-- use this once v12 is stable
|
|
||||||
vim.pack.add{
|
|
||||||
{ src='tpope/vim-fugitive' }, -- git client
|
|
||||||
{ src='tpope/vim-sensible' }, -- "sensible" vim defaults
|
|
||||||
{ src='tpope/vim-vinegar' }, -- netrw changes
|
|
||||||
}
|
}
|
||||||
]]
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user