Compare commits
No commits in common. "d46929c1f3e75bcd00fb9bbce30ff8ed60fb804c" and "4b45ae4d75c2a4dfe17d0d9453167858f1a94380" have entirely different histories.
d46929c1f3
...
4b45ae4d75
@ -3,152 +3,122 @@
|
||||
env:
|
||||
TERM: xterm-256color
|
||||
|
||||
# From https://gist.github.com/sainnhe/6432f83181c4520ea87b5211fed27950
|
||||
# Changed only to &dark and YAML &light labels
|
||||
schemes:
|
||||
everforest_dark_hard: &dark
|
||||
primary:
|
||||
background: '#272e33'
|
||||
foreground: '#d3c6aa'
|
||||
normal:
|
||||
black: '#414b50'
|
||||
red: '#e67e80'
|
||||
green: '#a7c080'
|
||||
yellow: '#dbbc7f'
|
||||
blue: '#7fbbb3'
|
||||
magenta: '#d699b6'
|
||||
cyan: '#83c092'
|
||||
white: '#d3c6aa'
|
||||
bright:
|
||||
black: '#475258'
|
||||
red: '#e67e80'
|
||||
green: '#a7c080'
|
||||
yellow: '#dbbc7f'
|
||||
blue: '#7fbbb3'
|
||||
magenta: '#d699b6'
|
||||
cyan: '#83c092'
|
||||
white: '#d3c6aa'
|
||||
everforest_dark_medium: &everforest_dark_medium
|
||||
primary:
|
||||
background: '#2d353b'
|
||||
foreground: '#d3c6aa'
|
||||
normal:
|
||||
black: '#475258'
|
||||
red: '#e67e80'
|
||||
green: '#a7c080'
|
||||
yellow: '#dbbc7f'
|
||||
blue: '#7fbbb3'
|
||||
magenta: '#d699b6'
|
||||
cyan: '#83c092'
|
||||
white: '#d3c6aa'
|
||||
bright:
|
||||
black: '#475258'
|
||||
red: '#e67e80'
|
||||
green: '#a7c080'
|
||||
yellow: '#dbbc7f'
|
||||
blue: '#7fbbb3'
|
||||
magenta: '#d699b6'
|
||||
cyan: '#83c092'
|
||||
white: '#d3c6aa'
|
||||
everforest_dark_soft: &everforest_dark_soft
|
||||
primary:
|
||||
background: '#333c43'
|
||||
foreground: '#d3c6aa'
|
||||
normal:
|
||||
black: '#4d5960'
|
||||
red: '#e67e80'
|
||||
green: '#a7c080'
|
||||
yellow: '#dbbc7f'
|
||||
blue: '#7fbbb3'
|
||||
magenta: '#d699b6'
|
||||
cyan: '#83c092'
|
||||
white: '#d3c6aa'
|
||||
bright:
|
||||
black: '#4d5960'
|
||||
red: '#e67e80'
|
||||
green: '#a7c080'
|
||||
yellow: '#dbbc7f'
|
||||
blue: '#7fbbb3'
|
||||
magenta: '#d699b6'
|
||||
cyan: '#83c092'
|
||||
white: '#d3c6aa'
|
||||
everforest_light_hard: &light
|
||||
primary:
|
||||
background: '#fffbef'
|
||||
foreground: '#5c6a72'
|
||||
normal:
|
||||
black: '#5c6a72'
|
||||
red: '#f85552'
|
||||
green: '#8da101'
|
||||
yellow: '#dfa000'
|
||||
blue: '#3a94c5'
|
||||
magenta: '#df69ba'
|
||||
cyan: '#35a77c'
|
||||
white: '#e8e5d5'
|
||||
bright:
|
||||
black: '#5c6a72'
|
||||
red: '#f85552'
|
||||
green: '#8da101'
|
||||
yellow: '#dfa000'
|
||||
blue: '#3a94c5'
|
||||
magenta: '#df69ba'
|
||||
cyan: '#35a77c'
|
||||
white: '#e8e5d5'
|
||||
everforest_light_medium: &everforest_light_medium
|
||||
primary:
|
||||
background: '#fdf6e3'
|
||||
foreground: '#5c6a72'
|
||||
normal:
|
||||
black: '#5c6a72'
|
||||
red: '#f85552'
|
||||
green: '#8da101'
|
||||
yellow: '#dfa000'
|
||||
blue: '#3a94c5'
|
||||
magenta: '#df69ba'
|
||||
cyan: '#35a77c'
|
||||
white: '#e0dcc7'
|
||||
bright:
|
||||
black: '#5c6a72'
|
||||
red: '#f85552'
|
||||
green: '#8da101'
|
||||
yellow: '#dfa000'
|
||||
blue: '#3a94c5'
|
||||
magenta: '#df69ba'
|
||||
cyan: '#35a77c'
|
||||
white: '#e0dcc7'
|
||||
everforest_light_soft: &everforest_light_soft
|
||||
primary:
|
||||
background: '#f3ead3'
|
||||
foreground: '#5c6a72'
|
||||
normal:
|
||||
black: '#5c6a72'
|
||||
red: '#f85552'
|
||||
green: '#8da101'
|
||||
yellow: '#dfa000'
|
||||
blue: '#3a94c5'
|
||||
magenta: '#df69ba'
|
||||
cyan: '#35a77c'
|
||||
white: '#d8d3ba'
|
||||
bright:
|
||||
black: '#5c6a72'
|
||||
red: '#f85552'
|
||||
green: '#8da101'
|
||||
yellow: '#dfa000'
|
||||
blue: '#3a94c5'
|
||||
magenta: '#df69ba'
|
||||
cyan: '#35a77c'
|
||||
white: '#d8d3ba'
|
||||
# (format t "~A" (cl-base16:apply-scheme (merge-pathnames "schemes/mexico-light/mexico-light.yaml" cl-base16:*source-dir*) "alacritty" "default"))
|
||||
# (format t "~A" (cl-base16:apply-scheme (merge-pathnames "schemes/mexico-light/mexico-light.yaml" cl-base16:*source-dir*) "alacritty" "default"))
|
||||
|
||||
# Base16 Espresso - alacritty color config
|
||||
# Unknown. Maintained by Alex Mirrington (https://github.com/alexmirrington)
|
||||
colors-dark: &dark
|
||||
# Default colors
|
||||
primary:
|
||||
background: '0x2d2d2d'
|
||||
foreground: '0xcccccc'
|
||||
|
||||
# Colors the cursor will use if `custom_cursor_colors` is true
|
||||
cursor:
|
||||
text: '0x2d2d2d'
|
||||
cursor: '0xcccccc'
|
||||
|
||||
# Normal colors
|
||||
normal:
|
||||
black: '0x2d2d2d'
|
||||
red: '0xd25252'
|
||||
green: '0xa5c261'
|
||||
yellow: '0xffc66d'
|
||||
blue: '0x6c99bb'
|
||||
magenta: '0xd197d9'
|
||||
cyan: '0xbed6ff'
|
||||
white: '0xcccccc'
|
||||
|
||||
# Bright colors
|
||||
bright:
|
||||
black: '0x777777'
|
||||
red: '0xf9a959'
|
||||
green: '0x393939'
|
||||
yellow: '0x515151'
|
||||
blue: '0xb4b7b4'
|
||||
magenta: '0xe0e0e0'
|
||||
cyan: '0xf97394'
|
||||
white: '0xffffff'
|
||||
|
||||
colors1:
|
||||
# Default colors
|
||||
primary:
|
||||
background: '0x3C4C55'
|
||||
foreground: '0xC5D4DD'
|
||||
|
||||
# Colors the cursor will use if `custom_cursor_colors` is true
|
||||
cursor:
|
||||
text: '0x3C4C55'
|
||||
cursor: '0xC5D4DD'
|
||||
|
||||
# Normal colors
|
||||
normal:
|
||||
black: '0x3C4C55'
|
||||
red: '0x83AFE5'
|
||||
green: '0x7FC1CA'
|
||||
yellow: '0xA8CE93'
|
||||
blue: '0x83AFE5'
|
||||
magenta: '0x9A93E1'
|
||||
cyan: '0xF2C38F'
|
||||
white: '0xC5D4DD'
|
||||
|
||||
# Bright colors
|
||||
bright:
|
||||
black: '0x899BA6'
|
||||
red: '0x7FC1CA'
|
||||
green: '0x556873'
|
||||
yellow: '0x6A7D89'
|
||||
blue: '0x899BA6'
|
||||
magenta: '0x899BA6'
|
||||
cyan: '0xF2C38F'
|
||||
white: '0x556873'
|
||||
|
||||
# Base16 Mexico Light - alacritty color config
|
||||
# Sheldon Johnson
|
||||
colors-light: &light
|
||||
# Default colors
|
||||
primary:
|
||||
background: '0xf8f8f8'
|
||||
foreground: '0x383838'
|
||||
|
||||
# Colors the cursor will use if `custom_cursor_colors` is true
|
||||
cursor:
|
||||
text: '0xf8f8f8'
|
||||
cursor: '0x383838'
|
||||
|
||||
# Normal colors
|
||||
normal:
|
||||
black: '0xf8f8f8'
|
||||
red: '0xab4642'
|
||||
green: '0x538947'
|
||||
yellow: '0xf79a0e'
|
||||
blue: '0x7cafc2'
|
||||
magenta: '0x96609e'
|
||||
cyan: '0x4b8093'
|
||||
white: '0x383838'
|
||||
|
||||
# Bright colors
|
||||
bright:
|
||||
black: '0xb8b8b8'
|
||||
red: '0xdc9656'
|
||||
green: '0xe8e8e8'
|
||||
yellow: '0xd8d8d8'
|
||||
blue: '0x585858'
|
||||
magenta: '0x282828'
|
||||
cyan: '0xa16946'
|
||||
white: '0x181818'
|
||||
|
||||
draw_bold_text_with_bright_colors: false
|
||||
|
||||
colors: *dark
|
||||
|
||||
font:
|
||||
size: 10
|
||||
size: 12
|
||||
normal:
|
||||
family: FiraCode Nerd Font Ret
|
||||
family: Iosevka Fixed Slab
|
||||
bold:
|
||||
family: FiraCode Nerd Font Ret
|
||||
family: Iosevka Fixed Slab heavy
|
||||
|
||||
key_bindings:
|
||||
- key: F6
|
||||
|
||||
@ -1,539 +0,0 @@
|
||||
-- If LuaRocks is installed, make sure that packages installed through it are
|
||||
-- found (e.g. lgi). If LuaRocks is not installed, do nothing.
|
||||
pcall(require, "luarocks.loader")
|
||||
|
||||
-- Standard awesome library
|
||||
local gears = require("gears")
|
||||
local awful = require("awful")
|
||||
require("awful.autofocus")
|
||||
-- Widget and layout library
|
||||
local wibox = require("wibox")
|
||||
-- Theme handling library
|
||||
local beautiful = require("beautiful")
|
||||
-- Notification library
|
||||
local naughty = require("naughty")
|
||||
local menubar = require("menubar")
|
||||
local hotkeys_popup = require("awful.hotkeys_popup")
|
||||
-- Enable hotkeys help widget for VIM and other apps
|
||||
-- when client with a matching name is opened:
|
||||
require("awful.hotkeys_popup.keys")
|
||||
|
||||
-- {{{ Error handling
|
||||
-- Check if awesome encountered an error during startup and fell back to
|
||||
-- another config (This code will only ever execute for the fallback config)
|
||||
if awesome.startup_errors then
|
||||
naughty.notify({
|
||||
preset = naughty.config.presets.critical,
|
||||
title = "Oops, there were errors during startup!",
|
||||
text = awesome.startup_errors
|
||||
})
|
||||
end
|
||||
|
||||
-- Handle runtime errors after startup
|
||||
do
|
||||
local in_error = false
|
||||
awesome.connect_signal("debug::error", function(err)
|
||||
-- Make sure we don't go into an endless error loop
|
||||
if in_error then return end
|
||||
in_error = true
|
||||
|
||||
naughty.notify({
|
||||
preset = naughty.config.presets.critical,
|
||||
title = "Oops, an error happened!",
|
||||
text = tostring(err)
|
||||
})
|
||||
in_error = false
|
||||
end)
|
||||
end
|
||||
-- }}}
|
||||
|
||||
-- {{{ Variable definitions
|
||||
-- Themes define colours, icons, font and wallpapers.
|
||||
local theme = "theme_dark.lua"
|
||||
beautiful.init(gears.filesystem.get_configuration_dir() .. theme)
|
||||
|
||||
local function switch_theme()
|
||||
if theme == "theme_dark.lua" then
|
||||
theme = "theme_light.lua"
|
||||
awful.spawn("lupan-set-theme light")
|
||||
else
|
||||
theme = "theme_dark.lua"
|
||||
awful.spawn("lupan-set-theme dark")
|
||||
end
|
||||
beautiful.init(gears.filesystem.get_configuration_dir() .. theme)
|
||||
end
|
||||
|
||||
-- This is used later as the default terminal and editor to run.
|
||||
local terminal = "alacritty"
|
||||
|
||||
-- Default modkey.
|
||||
local modkey = "Mod4"
|
||||
|
||||
-- Table of layouts to cover with awful.layout.inc, order matters.
|
||||
awful.layout.layouts = {
|
||||
awful.layout.suit.tile,
|
||||
awful.layout.suit.tile.left,
|
||||
awful.layout.suit.tile.bottom,
|
||||
awful.layout.suit.tile.top,
|
||||
awful.layout.suit.fair,
|
||||
awful.layout.suit.fair.horizontal,
|
||||
awful.layout.suit.spiral.dwindle,
|
||||
awful.layout.suit.max,
|
||||
awful.layout.suit.max.fullscreen,
|
||||
awful.layout.suit.magnifier,
|
||||
awful.layout.suit.corner.nw,
|
||||
awful.layout.suit.floating,
|
||||
-- awful.layout.suit.corner.ne,
|
||||
-- awful.layout.suit.corner.sw,
|
||||
-- awful.layout.suit.corner.se,
|
||||
}
|
||||
-- }}}
|
||||
|
||||
-- {{{ Menu
|
||||
-- Menubar configuration
|
||||
menubar.utils.terminal = terminal -- Set the terminal for applications that require it
|
||||
-- }}}
|
||||
|
||||
-- Keyboard map indicator and switcher
|
||||
local mykeyboardlayout = awful.widget.keyboardlayout()
|
||||
|
||||
-- {{{ Wibar
|
||||
-- Create a textclock widget
|
||||
local mytextclock = wibox.widget.textclock()
|
||||
|
||||
-- Create a wibox for each screen and add it
|
||||
local taglist_buttons = gears.table.join(
|
||||
awful.button({}, 1, function(t) t:view_only() end),
|
||||
awful.button({ modkey }, 1, function(t)
|
||||
if client.focus then
|
||||
client.focus:move_to_tag(t)
|
||||
end
|
||||
end),
|
||||
awful.button({}, 3, awful.tag.viewtoggle),
|
||||
awful.button({ modkey }, 3, function(t)
|
||||
if client.focus then
|
||||
client.focus:toggle_tag(t)
|
||||
end
|
||||
end),
|
||||
awful.button({}, 4, function(t) awful.tag.viewnext(t.screen) end),
|
||||
awful.button({}, 5, function(t) awful.tag.viewprev(t.screen) end)
|
||||
)
|
||||
|
||||
local tasklist_buttons = gears.table.join(
|
||||
awful.button({}, 1, function(c)
|
||||
if c == client.focus then
|
||||
c.minimized = true
|
||||
else
|
||||
c:emit_signal(
|
||||
"request::activate",
|
||||
"tasklist",
|
||||
{ raise = true }
|
||||
)
|
||||
end
|
||||
end),
|
||||
awful.button({}, 3, function()
|
||||
awful.menu.client_list({ theme = { width = 250 } })
|
||||
end),
|
||||
awful.button({}, 4, function()
|
||||
awful.client.focus.byidx(1)
|
||||
end),
|
||||
awful.button({}, 5, function()
|
||||
awful.client.focus.byidx(-1)
|
||||
end))
|
||||
|
||||
local function set_wallpaper(s)
|
||||
gears.wallpaper.set(beautiful.bg_wallpaper)
|
||||
end
|
||||
|
||||
-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution)
|
||||
screen.connect_signal("property::geometry", set_wallpaper)
|
||||
|
||||
awful.screen.connect_for_each_screen(function(s)
|
||||
-- Wallpaper
|
||||
set_wallpaper(s)
|
||||
|
||||
-- Each screen has its own tag table.
|
||||
awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[1])
|
||||
|
||||
-- Create a promptbox for each screen
|
||||
s.mypromptbox = awful.widget.prompt()
|
||||
-- Create an imagebox widget which will contain an icon indicating which layout we're using.
|
||||
-- We need one layoutbox per screen.
|
||||
s.mylayoutbox = awful.widget.layoutbox(s)
|
||||
s.mylayoutbox:buttons(gears.table.join(
|
||||
awful.button({}, 1, function() awful.layout.inc(1) end),
|
||||
awful.button({}, 3, function() awful.layout.inc(-1) end),
|
||||
awful.button({}, 4, function() awful.layout.inc(1) end),
|
||||
awful.button({}, 5, function() awful.layout.inc(-1) end)))
|
||||
-- Create a taglist widget
|
||||
s.mytaglist = awful.widget.taglist {
|
||||
screen = s,
|
||||
filter = awful.widget.taglist.filter.all,
|
||||
buttons = taglist_buttons
|
||||
}
|
||||
|
||||
-- Create a tasklist widget
|
||||
s.mytasklist = awful.widget.tasklist {
|
||||
screen = s,
|
||||
filter = awful.widget.tasklist.filter.currenttags,
|
||||
buttons = tasklist_buttons
|
||||
}
|
||||
|
||||
-- Create the wibox
|
||||
s.mywibox = awful.wibar({ position = "top", screen = s })
|
||||
|
||||
-- Add widgets to the wibox
|
||||
s.mywibox:setup {
|
||||
layout = wibox.layout.align.horizontal,
|
||||
{ -- Left widgets
|
||||
layout = wibox.layout.fixed.horizontal,
|
||||
s.mytaglist,
|
||||
s.mypromptbox,
|
||||
},
|
||||
s.mytasklist, -- Middle widget
|
||||
{ -- Right widgets
|
||||
layout = wibox.layout.fixed.horizontal,
|
||||
mykeyboardlayout,
|
||||
wibox.widget.systray(),
|
||||
mytextclock,
|
||||
s.mylayoutbox,
|
||||
},
|
||||
}
|
||||
end)
|
||||
-- }}}
|
||||
|
||||
function layout_menu()
|
||||
local layouts = {}
|
||||
for i, layout in pairs(awful.layout.layouts) do
|
||||
layouts[i] =
|
||||
{ layout.name,
|
||||
function()
|
||||
awful.layout.set(layout)
|
||||
end,
|
||||
beautiful["layout_" .. layout.name],
|
||||
}
|
||||
end
|
||||
awful.menu(layouts):show()
|
||||
end
|
||||
|
||||
-- {{{ Key bindings
|
||||
globalkeys = gears.table.join(
|
||||
awful.key({ modkey, }, "s", hotkeys_popup.show_help,
|
||||
{ description = "show help", group = "awesome" }),
|
||||
awful.key({ modkey, }, "Left", awful.tag.viewprev,
|
||||
{ description = "view previous", group = "tag" }),
|
||||
awful.key({ modkey, }, "Right", awful.tag.viewnext,
|
||||
{ description = "view next", group = "tag" }),
|
||||
awful.key({ modkey, }, "Tab", awful.tag.history.restore,
|
||||
{ description = "go back", group = "tag" }),
|
||||
|
||||
awful.key({ modkey, }, "j",
|
||||
function()
|
||||
awful.client.focus.byidx(1)
|
||||
end,
|
||||
{ description = "focus next by index", group = "client" }
|
||||
),
|
||||
awful.key({ modkey, }, "k",
|
||||
function()
|
||||
awful.client.focus.byidx(-1)
|
||||
end,
|
||||
{ description = "focus previous by index", group = "client" }
|
||||
),
|
||||
|
||||
-- Layout manipulation
|
||||
awful.key({ modkey, "Shift" }, "j", function() awful.client.swap.byidx(1) end,
|
||||
{ description = "swap with next client by index", group = "client" }),
|
||||
awful.key({ modkey, "Shift" }, "k", function() awful.client.swap.byidx(-1) end,
|
||||
{ description = "swap with previous client by index", group = "client" }),
|
||||
awful.key({ modkey, }, ".", function() awful.screen.focus_relative(1) end,
|
||||
{ description = "focus the next screen", group = "screen" }),
|
||||
awful.key({ modkey, }, ",", function() awful.screen.focus_relative(-1) end,
|
||||
{ description = "focus the previous screen", group = "screen" }),
|
||||
awful.key({ modkey, }, "u", awful.client.urgent.jumpto,
|
||||
{ description = "jump to urgent client", group = "client" }),
|
||||
awful.key({ modkey, }, "a",
|
||||
function()
|
||||
awful.client.focus.history.previous()
|
||||
if client.focus then
|
||||
client.focus:raise()
|
||||
end
|
||||
end,
|
||||
{ description = "go back", group = "client" }),
|
||||
|
||||
-- Standard program
|
||||
awful.key({ modkey, "Shift" }, "Return", function() awful.spawn(terminal) end,
|
||||
{ description = "open a terminal", group = "launcher" }),
|
||||
awful.key({ modkey, "Control", "Shift" }, "l", function() awful.spawn("slock") end,
|
||||
{ description = "open a terminal", group = "launcher" }),
|
||||
awful.key({ modkey, "Control", "Shift" }, "s", function() awful.spawn("systemctl suspend") end,
|
||||
{ description = "open a terminal", group = "launcher" }),
|
||||
awful.key({ modkey, "Shift" }, "F6", switch_theme,
|
||||
{ description = "switch theme", group = "launcher" }),
|
||||
awful.key({ modkey, }, "q", awesome.restart,
|
||||
{ description = "reload awesome", group = "awesome" }),
|
||||
awful.key({ modkey, "Control", "Shift" }, "q", awesome.quit,
|
||||
{ description = "quit awesome", group = "awesome" }),
|
||||
awful.key({ modkey, }, "l", function() awful.tag.incmwfact(0.05) end,
|
||||
{ description = "increase master width factor", group = "layout" }),
|
||||
awful.key({ modkey, }, "h", function() awful.tag.incmwfact(-0.05) end,
|
||||
{ description = "decrease master width factor", group = "layout" }),
|
||||
awful.key({ modkey, "Shift" }, "h", function() awful.tag.incnmaster(1, nil, true) end,
|
||||
{ description = "increase the number of master clients", group = "layout" }),
|
||||
awful.key({ modkey, "Shift" }, "l", function() awful.tag.incnmaster(-1, nil, true) end,
|
||||
{ description = "decrease the number of master clients", group = "layout" }),
|
||||
awful.key({ modkey, }, "i", function() awful.tag.incncol(1, nil, true) end,
|
||||
{ description = "increase the number of columns", group = "layout" }),
|
||||
awful.key({ modkey, }, "d", function() awful.tag.incncol(-1, nil, true) end,
|
||||
{ description = "decrease the number of columns", group = "layout" }),
|
||||
awful.key({ modkey, }, "space", function() awful.layout.inc(1) end,
|
||||
{ description = "select next", group = "layout" }),
|
||||
awful.key({ modkey, "Shift" }, "space", function() awful.layout.inc(-1) end,
|
||||
{ description = "select previous", group = "layout" }),
|
||||
awful.key({ modkey, "Control", "Shift", }, "space", layout_menu,
|
||||
{ description = "select layout from menu", group = "layout" }),
|
||||
awful.key({ modkey, "Control" }, "n",
|
||||
function()
|
||||
local c = awful.client.restore()
|
||||
-- Focus restored client
|
||||
if c then
|
||||
c:emit_signal(
|
||||
"request::activate", "key.unminimize", { raise = true }
|
||||
)
|
||||
end
|
||||
end,
|
||||
{ description = "restore minimized", group = "client" }),
|
||||
|
||||
-- Prompt
|
||||
awful.key({ modkey, }, "r", function() awful.screen.focused().mypromptbox:run() end,
|
||||
{ description = "run prompt", group = "launcher" }),
|
||||
|
||||
awful.key({ modkey, }, "x",
|
||||
function()
|
||||
awful.prompt.run {
|
||||
prompt = "Run Lua code: ",
|
||||
textbox = awful.screen.focused().mypromptbox.widget,
|
||||
exe_callback = awful.util.eval,
|
||||
history_path = awful.util.get_cache_dir() .. "/history_eval"
|
||||
}
|
||||
end,
|
||||
{ description = "lua execute prompt", group = "awesome" }),
|
||||
-- Menubar
|
||||
awful.key({ modkey, }, "p", function() menubar.show() end,
|
||||
{ description = "show the menubar", group = "launcher" })
|
||||
)
|
||||
|
||||
clientkeys = gears.table.join(
|
||||
awful.key({ modkey, }, "f",
|
||||
function(c)
|
||||
c.fullscreen = not c.fullscreen
|
||||
c:raise()
|
||||
end,
|
||||
{ description = "toggle fullscreen", group = "client" }),
|
||||
awful.key({ modkey, "Shift" }, "c", function(c) c:kill() end,
|
||||
{ description = "close", group = "client" }),
|
||||
awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle,
|
||||
{ description = "toggle floating", group = "client" }),
|
||||
awful.key({ modkey, }, "Return", function(c) c:swap(awful.client.getmaster()) end,
|
||||
{ description = "move to master", group = "client" }),
|
||||
awful.key({ modkey, "Shift" }, ".", function(c) c:move_to_screen() end,
|
||||
{ description = "move to screen", group = "client" }),
|
||||
awful.key({ modkey, }, "t", function(c) c.ontop = not c.ontop end,
|
||||
{ description = "toggle keep on top", group = "client" }),
|
||||
awful.key({ modkey, }, "n",
|
||||
function(c)
|
||||
-- The client currently has the input focus, so it cannot be
|
||||
-- minimized, since minimized clients can't have the focus.
|
||||
c.minimized = true
|
||||
end,
|
||||
{ description = "minimize", group = "client" }),
|
||||
awful.key({ modkey, }, "m",
|
||||
function(c)
|
||||
c.maximized = not c.maximized
|
||||
c:raise()
|
||||
end,
|
||||
{ description = "(un)maximize", group = "client" }),
|
||||
awful.key({ modkey, }, "v",
|
||||
function(c)
|
||||
c.maximized_vertical = not c.maximized_vertical
|
||||
c:raise()
|
||||
end,
|
||||
{ description = "(un)maximize vertically", group = "client" }),
|
||||
awful.key({ modkey, }, "b",
|
||||
function(c)
|
||||
c.maximized_horizontal = not c.maximized_horizontal
|
||||
c:raise()
|
||||
end,
|
||||
{ description = "(un)maximize horizontally", group = "client" })
|
||||
)
|
||||
|
||||
-- Bind all key numbers to tags.
|
||||
-- Be careful: we use keycodes to make it work on any keyboard layout.
|
||||
-- This should map on the top row of your keyboard, usually 1 to 9.
|
||||
for i = 1, 9 do
|
||||
globalkeys = gears.table.join(globalkeys,
|
||||
-- View tag only.
|
||||
awful.key({ modkey }, "#" .. i + 9,
|
||||
function()
|
||||
local screen = awful.screen.focused()
|
||||
local tag = screen.tags[i]
|
||||
if tag then
|
||||
tag:view_only()
|
||||
end
|
||||
end,
|
||||
{ description = "view tag #" .. i, group = "tag" }),
|
||||
-- Toggle tag display.
|
||||
awful.key({ modkey, "Control" }, "#" .. i + 9,
|
||||
function()
|
||||
local screen = awful.screen.focused()
|
||||
local tag = screen.tags[i]
|
||||
if tag then
|
||||
awful.tag.viewtoggle(tag)
|
||||
end
|
||||
end,
|
||||
{ description = "toggle tag #" .. i, group = "tag" }),
|
||||
-- Move client to tag.
|
||||
awful.key({ modkey, "Shift" }, "#" .. i + 9,
|
||||
function()
|
||||
if client.focus then
|
||||
local tag = client.focus.screen.tags[i]
|
||||
if tag then
|
||||
client.focus:move_to_tag(tag)
|
||||
end
|
||||
end
|
||||
end,
|
||||
{ description = "move focused client to tag #" .. i, group = "tag" }),
|
||||
-- Toggle tag on focused client.
|
||||
awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9,
|
||||
function()
|
||||
if client.focus then
|
||||
local tag = client.focus.screen.tags[i]
|
||||
if tag then
|
||||
client.focus:toggle_tag(tag)
|
||||
end
|
||||
end
|
||||
end,
|
||||
{ description = "toggle focused client on tag #" .. i, group = "tag" })
|
||||
)
|
||||
end
|
||||
|
||||
clientbuttons = gears.table.join(
|
||||
awful.button({}, 1, function(c)
|
||||
c:emit_signal("request::activate", "mouse_click", { raise = true })
|
||||
end),
|
||||
awful.button({ modkey }, 1, function(c)
|
||||
c:emit_signal("request::activate", "mouse_click", { raise = true })
|
||||
awful.mouse.client.move(c)
|
||||
end),
|
||||
awful.button({ modkey }, 3, function(c)
|
||||
c:emit_signal("request::activate", "mouse_click", { raise = true })
|
||||
awful.mouse.client.resize(c)
|
||||
end)
|
||||
)
|
||||
|
||||
-- Set keys
|
||||
root.keys(globalkeys)
|
||||
-- }}}
|
||||
|
||||
-- {{{ Rules
|
||||
-- Rules to apply to new clients (through the "manage" signal).
|
||||
awful.rules.rules = {
|
||||
-- All clients will match this rule.
|
||||
{
|
||||
rule = {},
|
||||
properties = {
|
||||
border_width = beautiful.border_width,
|
||||
border_color = beautiful.border_normal,
|
||||
focus = awful.client.focus.filter,
|
||||
raise = true,
|
||||
keys = clientkeys,
|
||||
buttons = clientbuttons,
|
||||
screen = awful.screen.preferred,
|
||||
placement = awful.placement.no_overlap + awful.placement.no_offscreen
|
||||
}
|
||||
},
|
||||
|
||||
-- Floating clients.
|
||||
{
|
||||
rule_any = {
|
||||
instance = {
|
||||
"DTA", -- Firefox addon DownThemAll.
|
||||
"copyq", -- Includes session name in class.
|
||||
"pinentry",
|
||||
},
|
||||
class = {
|
||||
"Arandr",
|
||||
"Blueman-manager",
|
||||
"Gpick",
|
||||
"Kruler",
|
||||
"MessageWin", -- kalarm.
|
||||
"Sxiv",
|
||||
"Tor Browser", -- Needs a fixed window size to avoid fingerprinting by screen size.
|
||||
"Wpa_gui",
|
||||
"veromix",
|
||||
"xtightvncviewer" },
|
||||
|
||||
-- Note that the name property shown in xprop might be set slightly after creation of the client
|
||||
-- and the name shown there might not match defined rules here.
|
||||
name = {
|
||||
"Event Tester", -- xev.
|
||||
},
|
||||
role = {
|
||||
"AlarmWindow", -- Thunderbird's calendar.
|
||||
"ConfigManager", -- Thunderbird's about:config.
|
||||
"pop-up", -- e.g. Google Chrome's (detached) Developer Tools.
|
||||
}
|
||||
},
|
||||
properties = { floating = true }
|
||||
},
|
||||
|
||||
-- Add titlebars to normal clients and dialogs
|
||||
{
|
||||
rule_any = { type = { "normal", "dialog" }
|
||||
},
|
||||
properties = { titlebars_enabled = true }
|
||||
},
|
||||
|
||||
-- Set Firefox to always map on the tag named "2" on screen 1.
|
||||
-- { rule = { class = "Firefox" },
|
||||
-- properties = { screen = 1, tag = "2" } },
|
||||
}
|
||||
-- }}}
|
||||
|
||||
-- {{{ Signals
|
||||
-- Signal function to execute when a new client appears.
|
||||
client.connect_signal("manage", function(c)
|
||||
-- Set the windows at the slave,
|
||||
-- i.e. put it at the end of others instead of setting it master.
|
||||
-- if not awesome.startup then awful.client.setslave(c) end
|
||||
|
||||
if awesome.startup
|
||||
and not c.size_hints.user_position
|
||||
and not c.size_hints.program_position then
|
||||
-- Prevent clients from being unreachable after screen count changes.
|
||||
awful.placement.no_offscreen(c)
|
||||
end
|
||||
end)
|
||||
|
||||
-- Add a titlebar if titlebars_enabled is set to true in the rules.
|
||||
client.connect_signal("request::titlebars", function(c)
|
||||
-- buttons for the titlebar
|
||||
local buttons = gears.table.join(
|
||||
awful.button({}, 1, function()
|
||||
c:emit_signal("request::activate", "titlebar", { raise = true })
|
||||
awful.mouse.client.move(c)
|
||||
end),
|
||||
awful.button({}, 3, function()
|
||||
c:emit_signal("request::activate", "titlebar", { raise = true })
|
||||
awful.mouse.client.resize(c)
|
||||
end)
|
||||
)
|
||||
end)
|
||||
|
||||
-- Enable sloppy focus, so that focus follows mouse.
|
||||
client.connect_signal("mouse::enter", function(c)
|
||||
c:emit_signal("request::activate", "mouse_enter", { raise = false })
|
||||
end)
|
||||
|
||||
client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
|
||||
client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
|
||||
-- }}}
|
||||
@ -1,51 +0,0 @@
|
||||
local themes_path = require("gears.filesystem").get_themes_dir()
|
||||
|
||||
local xresources = require("beautiful.xresources")
|
||||
local dpi = xresources.apply_dpi
|
||||
|
||||
local theme = {}
|
||||
|
||||
theme.font = "FiraCode Nerd Font Ret:size=10"
|
||||
theme.tasklist_disable_icon = true
|
||||
theme.wibar_height = 40
|
||||
|
||||
theme.bg_normal = "#1e293b"
|
||||
theme.bg_focus = "#475569"
|
||||
theme.bg_urgent = "#ff5555"
|
||||
theme.bg_minimize = "#444444"
|
||||
theme.bg_systray = theme.bg_normal
|
||||
theme.tasklist_bg_focus = "#334155"
|
||||
|
||||
theme.fg_normal = "#64748B"
|
||||
theme.fg_focus = "#94A3B8"
|
||||
theme.fg_urgent = "#111827"
|
||||
theme.fg_minimize = "#ffffff"
|
||||
theme.taglist_fg_empty = "#334155"
|
||||
|
||||
theme.useless_gap = dpi(1)
|
||||
theme.border_width = dpi(2)
|
||||
theme.border_normal = "#708090"
|
||||
theme.border_focus = "#a0522d"
|
||||
theme.border_marked = "#91231c"
|
||||
|
||||
theme.bg_wallpaper = "#4a4a4a"
|
||||
|
||||
-- You can use your own layout icons like this:
|
||||
theme.layout_fairh = themes_path .. "default/layouts/fairhw.png"
|
||||
theme.layout_fairv = themes_path .. "default/layouts/fairvw.png"
|
||||
theme.layout_floating = themes_path .. "default/layouts/floatingw.png"
|
||||
theme.layout_magnifier = themes_path .. "default/layouts/magnifierw.png"
|
||||
theme.layout_max = themes_path .. "default/layouts/maxw.png"
|
||||
theme.layout_fullscreen = themes_path .. "default/layouts/fullscreenw.png"
|
||||
theme.layout_tilebottom = themes_path .. "default/layouts/tilebottomw.png"
|
||||
theme.layout_tileleft = themes_path .. "default/layouts/tileleftw.png"
|
||||
theme.layout_tile = themes_path .. "default/layouts/tilew.png"
|
||||
theme.layout_tiletop = themes_path .. "default/layouts/tiletopw.png"
|
||||
theme.layout_spiral = themes_path .. "default/layouts/spiralw.png"
|
||||
theme.layout_dwindle = themes_path .. "default/layouts/dwindlew.png"
|
||||
theme.layout_cornernw = themes_path .. "default/layouts/cornernww.png"
|
||||
theme.layout_cornerne = themes_path .. "default/layouts/cornernew.png"
|
||||
theme.layout_cornersw = themes_path .. "default/layouts/cornersww.png"
|
||||
theme.layout_cornerse = themes_path .. "default/layouts/cornersew.png"
|
||||
|
||||
return theme
|
||||
@ -1,51 +0,0 @@
|
||||
local themes_path = require("gears.filesystem").get_themes_dir()
|
||||
|
||||
local xresources = require("beautiful.xresources")
|
||||
local dpi = xresources.apply_dpi
|
||||
|
||||
local theme = {}
|
||||
|
||||
theme.font = "FiraCode Nerd Font Ret:size=10"
|
||||
theme.tasklist_disable_icon = true
|
||||
theme.wibar_height = 40
|
||||
|
||||
theme.bg_normal = "#0c4a6e"
|
||||
theme.bg_focus = "#0284c7"
|
||||
theme.bg_urgent = "#ff5555"
|
||||
theme.bg_minimize = "#444444"
|
||||
theme.bg_systray = theme.bg_normal
|
||||
theme.tasklist_bg_focus = "#075985"
|
||||
|
||||
theme.fg_normal = "#cbd5e1"
|
||||
theme.fg_focus = "#bae6fd"
|
||||
theme.fg_urgent = "#111827"
|
||||
theme.fg_minimize = "#ffffff"
|
||||
theme.taglist_fg_empty = "#9ca3af"
|
||||
|
||||
theme.useless_gap = dpi(1)
|
||||
theme.border_width = dpi(2)
|
||||
theme.border_normal = "#bebebe"
|
||||
theme.border_focus = "#ff7f50"
|
||||
theme.border_marked = "#91231c"
|
||||
|
||||
theme.bg_wallpaper = "#dde1e3"
|
||||
|
||||
-- You can use your own layout icons like this:
|
||||
theme.layout_fairh = themes_path .. "default/layouts/fairhw.png"
|
||||
theme.layout_fairv = themes_path .. "default/layouts/fairvw.png"
|
||||
theme.layout_floating = themes_path .. "default/layouts/floatingw.png"
|
||||
theme.layout_magnifier = themes_path .. "default/layouts/magnifierw.png"
|
||||
theme.layout_max = themes_path .. "default/layouts/maxw.png"
|
||||
theme.layout_fullscreen = themes_path .. "default/layouts/fullscreenw.png"
|
||||
theme.layout_tilebottom = themes_path .. "default/layouts/tilebottomw.png"
|
||||
theme.layout_tileleft = themes_path .. "default/layouts/tileleftw.png"
|
||||
theme.layout_tile = themes_path .. "default/layouts/tilew.png"
|
||||
theme.layout_tiletop = themes_path .. "default/layouts/tiletopw.png"
|
||||
theme.layout_spiral = themes_path .. "default/layouts/spiralw.png"
|
||||
theme.layout_dwindle = themes_path .. "default/layouts/dwindlew.png"
|
||||
theme.layout_cornernw = themes_path .. "default/layouts/cornernww.png"
|
||||
theme.layout_cornerne = themes_path .. "default/layouts/cornernew.png"
|
||||
theme.layout_cornersw = themes_path .. "default/layouts/cornersww.png"
|
||||
theme.layout_cornerse = themes_path .. "default/layouts/cornersew.png"
|
||||
|
||||
return theme
|
||||
@ -21,7 +21,7 @@ local on_attach = function(_, bufnr)
|
||||
|
||||
-- See `:help K` for why this keymap
|
||||
nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
|
||||
nmap('<leader>K', vim.lsp.buf.signature_help, 'Signature Documentation')
|
||||
nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
|
||||
|
||||
-- Lesser used LSP functionality
|
||||
nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
|
||||
@ -85,14 +85,12 @@ require('luasnip.loaders.from_vscode').lazy_load()
|
||||
luasnip.config.setup {}
|
||||
|
||||
cmp.setup {
|
||||
completion = { autocomplete = false },
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
luasnip.lsp_expand(args.body)
|
||||
end,
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert {
|
||||
['<C-l>'] = cmp.mapping.confirm({ select = true }),
|
||||
['<C-n>'] = cmp.mapping.select_next_item(),
|
||||
['<C-p>'] = cmp.mapping.select_prev_item(),
|
||||
['<C-d>'] = cmp.mapping.scroll_docs(-4),
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
local ls = require "luasnip"
|
||||
|
||||
ls.config.set_config {
|
||||
history = true,
|
||||
updateevents = "TextChanged,TextChangedI",
|
||||
}
|
||||
|
||||
require("luasnip.loaders.from_lua").load({ paths = "~/.config/nvim/snippets" })
|
||||
20
nvim/.config/nvim/after/plugin/telescope.lua
Normal file
20
nvim/.config/nvim/after/plugin/telescope.lua
Normal file
@ -0,0 +1,20 @@
|
||||
pcall(require('telescope').load_extension, 'fzf')
|
||||
|
||||
local builtin = require('telescope.builtin')
|
||||
vim.keymap.set('n', '<leader><space>', builtin.buffers, { desc = '[ ] Find existing buffers' })
|
||||
vim.keymap.set('n', '<leader>?', builtin.oldfiles, { desc = '[?] Find recently opened buffers' })
|
||||
vim.keymap.set('n', '<leader>/', function()
|
||||
builtin.current_buffer_fuzzy_find(require("telescope.themes").get_dropdown { previewer = false })
|
||||
end, { desc = '[?] Find recently opened buffers' })
|
||||
|
||||
vim.keymap.set('n', '<leader>gf', builtin.git_files, { desc = '[G]it [f]iles' })
|
||||
vim.keymap.set('n', '<leader>gs', builtin.git_status, { desc = '[G]it [s]tatus' })
|
||||
vim.keymap.set('n', '<leader>ff', builtin.find_files, { desc = '[F]ind [f]iles' })
|
||||
vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = '[F]ind [g]rep' })
|
||||
vim.keymap.set('n', '<leader>fw', builtin.grep_string, { desc = '[F]ind [w]ord' })
|
||||
vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = '[F]ind [h]elp (tags)' })
|
||||
vim.keymap.set('n', '<leader>fd', builtin.diagnostics, { desc = '[F]ind [d]iagnostics' })
|
||||
|
||||
vim.keymap.set('n', '<leader>fF', function()
|
||||
builtin.find_files { hidden = true }
|
||||
end, { desc = '[F]find [F]iles (with hidden)' })
|
||||
30
nvim/.config/nvim/after/plugin/trash.txt
Normal file
30
nvim/.config/nvim/after/plugin/trash.txt
Normal file
@ -0,0 +1,30 @@
|
||||
|
||||
print('lsp')
|
||||
|
||||
local lsp = require('lsp-zero').preset({})
|
||||
|
||||
lsp.on_attach(function(client, bufnr)
|
||||
-- see :help lsp-zero-keybindings
|
||||
-- to learn the available actions
|
||||
lsp.default_keymaps({buffer = bufnr})
|
||||
end)
|
||||
|
||||
lsp.setup()
|
||||
|
||||
-- You need to setup `cmp` after lsp-zero
|
||||
local cmp = require('cmp')
|
||||
local cmp_action = require('lsp-zero').cmp_action()
|
||||
|
||||
cmp.setup({
|
||||
mapping = {
|
||||
-- `Enter` key to confirm completion
|
||||
-- ['<CR>'] = cmp.mapping.confirm({select = false}),
|
||||
|
||||
-- Ctrl+Space to trigger completion menu
|
||||
['<C-Space>'] = cmp.mapping.complete(),
|
||||
|
||||
-- Navigate between snippet placeholder
|
||||
['<C-f>'] = cmp_action.luasnip_jump_forward(),
|
||||
['<C-b>'] = cmp_action.luasnip_jump_backward(),
|
||||
}
|
||||
})
|
||||
@ -2,12 +2,13 @@ local org = require('orgmode')
|
||||
org.setup_ts_grammar()
|
||||
|
||||
require('nvim-treesitter.configs').setup {
|
||||
ensure_installed = { 'c', 'cpp', 'go', 'haskell', 'lua', 'org', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim' },
|
||||
ensure_installed = { 'c', 'cpp', 'go', 'haskell', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim' },
|
||||
auto_install = false,
|
||||
highlight = {
|
||||
enable = true,
|
||||
additional_vim_regex_highlighting = { 'org' },
|
||||
},
|
||||
ensure_installed = { 'org' }, -- Or run :TSUpdate org
|
||||
indent = { enable = true },
|
||||
incremental_selection = {
|
||||
enable = true,
|
||||
@ -63,17 +64,6 @@ require('nvim-treesitter.configs').setup {
|
||||
},
|
||||
}
|
||||
|
||||
local treesitter_parser_config = require "nvim-treesitter.parsers".get_parser_configs()
|
||||
treesitter_parser_config.templ = {
|
||||
install_info = {
|
||||
url = "https://github.com/vrischmann/tree-sitter-templ.git",
|
||||
files = { "src/parser.c", "src/scanner.c" },
|
||||
branch = "master",
|
||||
},
|
||||
}
|
||||
|
||||
vim.treesitter.language.register('templ', 'templ')
|
||||
|
||||
org.setup({
|
||||
org_agenda_files = { '~/org/*.org' },
|
||||
org_default_notes_file = '~/org/capture.org',
|
||||
|
||||
@ -2,4 +2,4 @@ require("lupan.remap")
|
||||
require("lupan.lazy")
|
||||
require("lupan.options")
|
||||
require("lupan.autocmd")
|
||||
require('lazy').setup('plugins')
|
||||
require("lupan.plugins")
|
||||
|
||||
@ -10,6 +10,11 @@ vim.wo.relativenumber = true
|
||||
-- Enable mouse mode
|
||||
vim.o.mouse = 'a'
|
||||
|
||||
-- Sync clipboard between OS and Neovim.
|
||||
-- Remove this option if you want your OS clipboard to remain independent.
|
||||
-- See `:help 'clipboard'`
|
||||
vim.o.clipboard = 'unnamedplus'
|
||||
|
||||
-- Enable break indent
|
||||
vim.o.breakindent = true
|
||||
|
||||
@ -34,11 +39,3 @@ vim.o.completeopt = 'menuone,noselect'
|
||||
vim.o.termguicolors = true
|
||||
|
||||
vim.o.scrolloff = 8
|
||||
|
||||
vim.o.tabstop = 8
|
||||
vim.o.softtabstop = 4
|
||||
vim.o.shiftwidth = 4
|
||||
vim.o.expandtab = true
|
||||
vim.o.expandtab = true
|
||||
|
||||
vim.g.lightspeed_no_default_keymaps = true
|
||||
|
||||
@ -1 +1,144 @@
|
||||
-- require('lazy').setup('plugins')
|
||||
require('lazy').setup({
|
||||
-- Fuzzy finder
|
||||
{
|
||||
'nvim-telescope/telescope.nvim',
|
||||
branch = '0.1.x',
|
||||
dependencies = {
|
||||
'nvim-lua/plenary.nvim' }
|
||||
},
|
||||
|
||||
-- Colorscheme
|
||||
{
|
||||
'neanias/everforest-nvim',
|
||||
priority = 1000,
|
||||
lazy = false,
|
||||
config = function()
|
||||
require("everforest").setup({
|
||||
background = 'hard',
|
||||
})
|
||||
vim.cmd.colorscheme 'everforest'
|
||||
end
|
||||
},
|
||||
|
||||
{
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
dependencies = {
|
||||
'nvim-treesitter/nvim-treesitter-textobjects',
|
||||
'nvim-orgmode/orgmode', -- as configured together
|
||||
},
|
||||
build =
|
||||
':TSUpdate'
|
||||
},
|
||||
|
||||
{
|
||||
-- Statusline (see `:help lualine.txt`)
|
||||
'nvim-lualine/lualine.nvim',
|
||||
opts = {
|
||||
options = {
|
||||
icons_enabled = false,
|
||||
theme = 'everforest',
|
||||
component_separators = '|',
|
||||
section_separators = '',
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
-- Indentation guides (see `:help indent_blankline.txt`)
|
||||
'lukas-reineke/indent-blankline.nvim',
|
||||
opts = {
|
||||
char = '┊',
|
||||
show_trailing_blankline_indent = false,
|
||||
},
|
||||
},
|
||||
|
||||
-- "gc" to comment visual regions/lines
|
||||
{ 'numToStr/Comment.nvim', opts = {} },
|
||||
|
||||
'norcalli/nvim-colorizer.lua',
|
||||
|
||||
-- Undo browsing
|
||||
'mbbill/undotree',
|
||||
|
||||
-- Git
|
||||
'tpope/vim-fugitive',
|
||||
|
||||
-- Tabstops autodetected
|
||||
'tpope/vim-sleuth',
|
||||
|
||||
{
|
||||
-- LSP Configuration & Plugins
|
||||
'neovim/nvim-lspconfig',
|
||||
dependencies = {
|
||||
-- Automatically install LSPs to stdpath for neovim
|
||||
{ 'williamboman/mason.nvim', config = true },
|
||||
'williamboman/mason-lspconfig.nvim',
|
||||
|
||||
-- Useful status updates for LSP
|
||||
{ 'j-hui/fidget.nvim', tag = 'legacy', opts = {} },
|
||||
|
||||
-- Additional lua configuration, makes nvim stuff amazing!
|
||||
'folke/neodev.nvim',
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
-- Autocompletion
|
||||
'hrsh7th/nvim-cmp',
|
||||
dependencies = {
|
||||
-- Snippet Engine & its associated nvim-cmp source
|
||||
'L3MON4D3/LuaSnip',
|
||||
'saadparwaiz1/cmp_luasnip',
|
||||
|
||||
-- Adds LSP completion capabilities
|
||||
'hrsh7th/cmp-nvim-lsp',
|
||||
|
||||
-- Adds a number of user-friendly snippets
|
||||
'rafamadriz/friendly-snippets',
|
||||
},
|
||||
},
|
||||
|
||||
-- Show pending keybinds
|
||||
{ 'folke/which-key.nvim', opts = {} },
|
||||
|
||||
{
|
||||
-- Adds git releated signs to the gutter, as well as utilities for managing changes
|
||||
'lewis6991/gitsigns.nvim',
|
||||
opts = {
|
||||
-- See `:help gitsigns.txt`
|
||||
signs = {
|
||||
add = { text = '+' },
|
||||
change = { text = '~' },
|
||||
delete = { text = '_' },
|
||||
topdelete = { text = '‾' },
|
||||
changedelete = { text = '~' },
|
||||
},
|
||||
on_attach = function(bufnr)
|
||||
vim.keymap.set('n', '<leader>gp', require('gitsigns').prev_hunk,
|
||||
{ buffer = bufnr, desc = '[G]o to [P]revious Hunk' })
|
||||
vim.keymap.set('n', '<leader>gn', require('gitsigns').next_hunk, { buffer = bufnr, desc = '[G]o to [N]ext Hunk' })
|
||||
vim.keymap.set('n', '<leader>ph', require('gitsigns').preview_hunk, { buffer = bufnr, desc = '[P]review [H]unk' })
|
||||
vim.keymap.set('n', '<leader>sh', require('gitsigns').stage_hunk, { buffer = bufnr, desc = '[S]tage [H]unk' })
|
||||
end,
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
"kylechui/nvim-surround",
|
||||
version = "*", -- Use for stability; omit to use `main` branch for the latest features
|
||||
event = "VeryLazy",
|
||||
config = function()
|
||||
require("nvim-surround").setup({})
|
||||
end
|
||||
},
|
||||
|
||||
{
|
||||
'akinsho/toggleterm.nvim',
|
||||
version = "*",
|
||||
opts = {
|
||||
direction = "float",
|
||||
open_mapping = [[<C-\>]],
|
||||
}
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
@ -1,170 +1,29 @@
|
||||
vim.g.mapleader = ' '
|
||||
vim.g.maplocalleader = ' '
|
||||
|
||||
local key = vim.keymap.set
|
||||
local opts = { silent = true, noremap = true }
|
||||
|
||||
key('v', '<Space>', '<Nop>', { silent = true })
|
||||
vim.keymap.set('v', '<Space>', '<Nop>', { silent = true })
|
||||
|
||||
-- Remap for dealing with word wrap
|
||||
key('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
|
||||
key('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
|
||||
vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
|
||||
vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
|
||||
|
||||
key("n", "<leader>dd", ":Explore<cr>", { desc = "[D]isplay [d]irectory" })
|
||||
key("n", "<leader>dv", ":Vexplore<cr>", { desc = "[D]isplay directory ([v]ertical split)" })
|
||||
key("n", "<leader>dh", ":Sexplore<cr>", { desc = "[D]isplay [d]irectory ([h]orizontal split)" })
|
||||
key("n", "<leader>dt", ":Lexplore 30<cr>", { desc = "[D]isplay directory [t]oggle" })
|
||||
key("n", "<leader>ct", ":ColorizerToggle<cr>", { desc = "[C]olorizer [t]oggle" })
|
||||
key("n", "<leader>ut", ":UndotreeToggle<cr>", { desc = "[U]undotree [t]oggle" })
|
||||
|
||||
-- telescope
|
||||
|
||||
key('n', '<leader><space>', '<cmd>Telescope buffers<cr>', { desc = '[ ] Find existing buffers' })
|
||||
key('n', '<leader>?', '<cmd>Telescope oldfiles<cr>', { desc = '[?] Find recently opened buffers' })
|
||||
key('n', '<leader>/', function()
|
||||
require('telescope.builtin').current_buffer_fuzzy_find(require("telescope.themes").get_dropdown { previewer = false })
|
||||
end, { desc = '[/] Find in current buffer' })
|
||||
|
||||
key('n', '<leader>gf', '<cmd>Telescope git_files<cr>', { desc = '[G]it [f]iles' })
|
||||
key('n', '<leader>gs', '<cmd>Telescope git_status<cr>', { desc = '[G]it [s]tatus' })
|
||||
key('n', '<leader>ff', '<cmd>Telescope find_files<cr>', { desc = '[F]ind [f]iles' })
|
||||
key('n', '<leader>fg', '<cmd>Telescope live_grep<cr>', { desc = '[F]ind [g]rep' })
|
||||
key('n', '<leader>fw', '<cmd>Telescope grep_string<cr>', { desc = '[F]ind [w]ord' })
|
||||
key('n', '<leader>fh', '<cmd>Telescope help_tags<cr>', { desc = '[F]ind [h]elp (tags)' })
|
||||
key('n', '<leader>fd', '<cmd>Telescope diagnostics<cr>', { desc = '[F]ind [d]iagnostics' })
|
||||
key('n', '<leader>fk', '<cmd>Telescope keymaps<cr>', { desc = '[F]ind [k]eymaps' })
|
||||
|
||||
key('n', '<leader>fF', function()
|
||||
require('telescope.builtin').find_files { hidden = true }
|
||||
end, { desc = '[F]ind [F]iles (with hidden)' })
|
||||
|
||||
key('n', '<leader>td', function()
|
||||
require('lupan.ui').tab_change_dir()
|
||||
end, { desc = '[T]ab change [d]irectory' })
|
||||
|
||||
key('n', '<leader>tD', function()
|
||||
require('lupan.ui').tab_change_dir_newtab()
|
||||
end, { desc = '[T]ab change [D]irectory (new tab)' })
|
||||
|
||||
key('n', '<leader>tm', function()
|
||||
require('telescope-tabs').list_tabs(require 'telescope.themes'.get_dropdown())
|
||||
end, { desc = '[T]ab change [D]irectory (new tab)' })
|
||||
|
||||
key('n', '<leader>tt', function()
|
||||
require('telescope-tabs').go_to_previous()
|
||||
end, { desc = '[T]ab [t]oggle previous' })
|
||||
|
||||
for i = 1, 9, 1 do
|
||||
key('n', '<leader>t' .. i, '<cmd>' .. i .. 'tabnext<cr>', { desc = '[T]ab nr [' .. i .. ']' })
|
||||
end
|
||||
vim.keymap.set("n", "<leader>dd", ":Explore<cr>", { desc = "[D]isplay [d]irectory" })
|
||||
vim.keymap.set("n", "<leader>ct", ":ColorizerToggle<cr>", { desc = "[C]olorizer [t]oggle" })
|
||||
vim.keymap.set("n", "<leader>ut", ":UndotreeToggle<cr>", { desc = "[U]undotree [t]oggle" })
|
||||
|
||||
-- Diagnostic keymaps
|
||||
key('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' })
|
||||
key('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' })
|
||||
key('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
|
||||
key('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
|
||||
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' })
|
||||
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' })
|
||||
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
|
||||
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
|
||||
|
||||
key('n', '<leader>N', ':bn<cr>', { desc = '[N]ext buffer' })
|
||||
key('n', '<leader>P', ':bp<cr>', { desc = '[P]revious buffer' })
|
||||
vim.keymap.set('n', '<leader>N', ':bn<cr>', { desc = '[N]ext buffer' })
|
||||
vim.keymap.set('n', '<leader>P', ':bp<cr>', { desc = '[P]revious buffer' })
|
||||
|
||||
key('n', '<leader>tc', ':tabnew<cr>', { desc = '[T]ab [c]reate' })
|
||||
key('n', '<leader>ts', ':tab split<cr>', { desc = '[T]ab [s]plit' })
|
||||
key('n', '<leader>tn', ':tabnext<cr>', { desc = '[T]ab [n]ext' })
|
||||
key('n', '<leader>tp', ':tabprevious<cr>', { desc = '[T]ab [p]revious' })
|
||||
key('n', '<leader>tf', ':tabfirst<cr>', { desc = '[T]ab [f]irst' })
|
||||
key('n', '<leader>tl', ':tablast<cr>', { desc = '[T]tab [l]ast' })
|
||||
vim.keymap.set('n', '<leader>tc', ':tabnew<cr>', { desc = '[T]ab [c]reate' })
|
||||
vim.keymap.set('n', '<leader>ts', ':tab split<cr>', { desc = '[T]ab [s]plit' })
|
||||
vim.keymap.set('n', '<leader>tn', ':tabnext<cr>', { desc = '[T]ab [n]ext' })
|
||||
vim.keymap.set('n', '<leader>tp', ':tabprevious<cr>', { desc = '[T]ab [p]revious' })
|
||||
|
||||
key('v', 'J', ":m '>+1<cr>gv=gv", { desc = "Move lines down" })
|
||||
key('v', 'K', ":m '<-2<cr>gv=gv", { desc = "Move lines up" })
|
||||
|
||||
-- Change window
|
||||
key('n', '<C-j>', '<C-w>j', opts)
|
||||
key('n', '<C-k>', '<C-w>k', opts)
|
||||
key('n', '<C-h>', '<C-w>h', opts)
|
||||
key('n', '<C-l>', '<C-w>l', opts)
|
||||
|
||||
-- Stay in key mode
|
||||
key('v', '<', '<gv', opts)
|
||||
key('v', '>', '>gv', opts)
|
||||
|
||||
-- Keep old value of register
|
||||
key('v', 'P', '"_dP', opts)
|
||||
|
||||
-- LightSpeed
|
||||
key('n', 'g/', '<Plug>Lightspeed_s', { desc = "Lightspeed forward search" })
|
||||
key('n', 'g?', '<Plug>Lightspeed_S', { desc = "Lightspeed backward search" })
|
||||
|
||||
-- Clipboard and quickfix
|
||||
key({ 'n', 'v' }, '<leader>y', '"+y', { desc = "Yank to clipboard" })
|
||||
key('n', '<leader>j', ':cn<CR>', { desc = "Quickfix next" })
|
||||
key('n', '<leader>k', ':cp<CR>', { desc = "Quickfix previous" })
|
||||
|
||||
-- luasnip
|
||||
|
||||
vim.keymap.set({ 'i', 's' }, "<c-k>", function()
|
||||
local ls = require "luasnip"
|
||||
if ls.expand_or_jumpable() then
|
||||
ls.expand_or_jump()
|
||||
end
|
||||
end, { silent = true })
|
||||
|
||||
vim.keymap.set({ 'i', 's' }, "<c-j>", function()
|
||||
local ls = require "luasnip"
|
||||
if ls.jumpable(-1) then
|
||||
ls.jump(-1)
|
||||
end
|
||||
end, { silent = true })
|
||||
|
||||
vim.keymap.set({ 'i', 's' }, "<c-l>", function()
|
||||
local ls = require "luasnip"
|
||||
if ls.choice_active() then
|
||||
ls.change_choice(1)
|
||||
end
|
||||
end, { silent = true })
|
||||
|
||||
vim.keymap.set("n", "<leader>ss", "<cmd>source ~/.config/nvim/after/plugin/luasnip.lua<CR>",
|
||||
{ desc = "[S]nippets [s]ource" })
|
||||
|
||||
-- terminal
|
||||
|
||||
key('t', '<C-_>', '<C-\\><C-n>')
|
||||
|
||||
-- harpoon
|
||||
|
||||
key('n', '<leader>ha', function()
|
||||
require("harpoon.mark").add_file()
|
||||
end, { desc = '[H]arpoon [a]dd' })
|
||||
|
||||
key('n', '<leader>hm', function()
|
||||
require("harpoon.ui").toggle_quick_menu()
|
||||
end, { desc = '[H]arpoon toggle quick [m]enu' })
|
||||
|
||||
key('n', '<leader>hj', function()
|
||||
require("harpoon.ui").nav_next()
|
||||
end, { desc = '[H]arpoon next (j)' })
|
||||
|
||||
key('n', '<leader>hk', function()
|
||||
require("harpoon.ui").nav_prev()
|
||||
end, { desc = '[H]arpoon prev (k)' })
|
||||
|
||||
for i = 1, 9, 1 do
|
||||
key('n', '<M-' .. i .. '>', function()
|
||||
require("harpoon.ui").nav_file(i)
|
||||
end, { desc = '[H]arpoon nav_file [' .. i .. ']' })
|
||||
end
|
||||
|
||||
for i = 1, 9, 1 do
|
||||
key('n', '<leader>T' .. i, function()
|
||||
require("harpoon.term").gotoTerminal(i)
|
||||
end, { desc = '[H]arpoon nav_file [' .. i .. ']' })
|
||||
end
|
||||
|
||||
-- colors
|
||||
|
||||
key('n', '<F6>', function()
|
||||
if vim.o.background == "dark" then
|
||||
vim.o.background = "light"
|
||||
else
|
||||
vim.o.background = "dark"
|
||||
end
|
||||
end)
|
||||
vim.keymap.set('v', 'J', ":m '>+1<cr>gv=gv", { desc = "Move lines down" })
|
||||
vim.keymap.set('v', 'K', ":m '<-2<cr>gv=gv", { desc = "Move lines up" })
|
||||
|
||||
@ -1,44 +0,0 @@
|
||||
local actions = require "telescope.actions"
|
||||
local action_state = require "telescope.actions.state"
|
||||
local finders = require "telescope.finders"
|
||||
local pickers = require "telescope.pickers"
|
||||
local sorters = require "telescope.sorters"
|
||||
local themes = require "telescope.themes"
|
||||
|
||||
local M = {}
|
||||
|
||||
local function enter(prompt_bufnr, action)
|
||||
local selected = action_state.get_selected_entry()
|
||||
actions.close(prompt_bufnr)
|
||||
action(selected[1])
|
||||
end
|
||||
|
||||
function M.tab_change_dir(opts)
|
||||
opts = opts or {}
|
||||
local action = opts.action or vim.cmd.tc
|
||||
local prompt_title = opts.prompt_title or "Tab change directory"
|
||||
local cmd = { 'find', os.getenv('HOME'), '-maxdepth', '5', '-type', 'd', '-not', '-path', '*/.git*' }
|
||||
local dropdown = themes.get_dropdown();
|
||||
local picker_opts = {
|
||||
prompt_title = prompt_title,
|
||||
finder = finders.new_oneshot_job(cmd, {}),
|
||||
sorter = sorters.get_fuzzy_file({}),
|
||||
attach_mappings = function(_, map)
|
||||
map({ "i", "n" }, "<CR>", function(prompt_bufnr) enter(prompt_bufnr, action) end)
|
||||
return true
|
||||
end
|
||||
}
|
||||
local change_dir = pickers.new(dropdown, picker_opts)
|
||||
change_dir:find()
|
||||
end
|
||||
|
||||
local function tabnew_tcd(dir)
|
||||
vim.cmd.tabnew(dir)
|
||||
vim.cmd.tc(dir)
|
||||
end
|
||||
|
||||
function M.tab_change_dir_newtab()
|
||||
M.tab_change_dir({ action = tabnew_tcd, prompt_title = "Tab change directory (new tab)" })
|
||||
end
|
||||
|
||||
return M
|
||||
@ -1,42 +0,0 @@
|
||||
return {
|
||||
-- Colorscheme
|
||||
{
|
||||
'neanias/everforest-nvim',
|
||||
priority = 1000,
|
||||
lazy = false,
|
||||
config = function()
|
||||
require("everforest").setup({
|
||||
background = 'hard',
|
||||
})
|
||||
vim.cmd.colorscheme 'everforest'
|
||||
end
|
||||
},
|
||||
|
||||
{
|
||||
-- Statusline (see `:help lualine.txt`)
|
||||
'nvim-lualine/lualine.nvim',
|
||||
opts = {
|
||||
options = {
|
||||
icons_enabled = false,
|
||||
theme = 'everforest',
|
||||
component_separators = '|',
|
||||
section_separators = '',
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
-- Indentation guides (see `:help indent_blankline.txt`)
|
||||
'lukas-reineke/indent-blankline.nvim',
|
||||
main = "ibl",
|
||||
opts = {
|
||||
-- char = '┊',
|
||||
-- show_trailing_blankline_indent = false,
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
'norcalli/nvim-colorizer.lua',
|
||||
cmd = 'ColorizerToggle'
|
||||
},
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
return {
|
||||
-- "gc" to comment visual regions/lines
|
||||
{
|
||||
'numToStr/Comment.nvim',
|
||||
opts = {}
|
||||
},
|
||||
|
||||
-- Undo browsing
|
||||
'mbbill/undotree',
|
||||
|
||||
|
||||
-- Tabstops autodetected
|
||||
'tpope/vim-sleuth',
|
||||
|
||||
{
|
||||
"kylechui/nvim-surround",
|
||||
version = "*", -- Use for stability; omit to use `main` branch for the latest features
|
||||
event = "VeryLazy",
|
||||
config = function()
|
||||
require("nvim-surround").setup({})
|
||||
end
|
||||
},
|
||||
|
||||
'ggandor/lightspeed.nvim',
|
||||
}
|
||||
@ -1,32 +0,0 @@
|
||||
return {
|
||||
-- Git
|
||||
'tpope/vim-fugitive',
|
||||
|
||||
{
|
||||
-- Adds git releated signs to the gutter, as well as utilities for managing changes
|
||||
'lewis6991/gitsigns.nvim',
|
||||
opts = {
|
||||
-- See `:help gitsigns.txt`
|
||||
signs = {
|
||||
add = { text = '+' },
|
||||
change = { text = '~' },
|
||||
delete = { text = '_' },
|
||||
topdelete = { text = '‾' },
|
||||
changedelete = { text = '~' },
|
||||
},
|
||||
on_attach = function(bufnr)
|
||||
local gs = require('gitsigns')
|
||||
vim.keymap.set('n', '<leader>gp', gs.prev_hunk,
|
||||
{ buffer = bufnr, desc = '[G]o to [P]revious Hunk' })
|
||||
vim.keymap.set('n', '<leader>gn', gs.next_hunk,
|
||||
{ buffer = bufnr, desc = '[G]o to [N]ext Hunk' })
|
||||
vim.keymap.set('n', '<leader>ph', gs.preview_hunk,
|
||||
{ buffer = bufnr, desc = '[P]review [H]unk' })
|
||||
vim.keymap.set('n', '<leader>sh', gs.stage_hunk,
|
||||
{ buffer = bufnr, desc = '[S]tage [H]unk' })
|
||||
vim.keymap.set('n', '<leader>HD', function() gs.diffthis('~') end,
|
||||
{ buffer = bufnr, desc = '[H]unk [D]iff' })
|
||||
end,
|
||||
},
|
||||
},
|
||||
}
|
||||
@ -1,75 +0,0 @@
|
||||
return {
|
||||
-- Fuzzy finder
|
||||
{
|
||||
'nvim-telescope/telescope.nvim',
|
||||
branch = '0.1.x',
|
||||
dependencies = {
|
||||
'nvim-lua/plenary.nvim' },
|
||||
config = function()
|
||||
pcall(require('telescope').load_extension, 'fzf')
|
||||
end,
|
||||
cmd = 'Telescope',
|
||||
},
|
||||
|
||||
{
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
dependencies = {
|
||||
'nvim-treesitter/nvim-treesitter-textobjects',
|
||||
'nvim-orgmode/orgmode', -- as configured together
|
||||
'vrischmann/tree-sitter-templ',
|
||||
},
|
||||
build =
|
||||
':TSUpdate'
|
||||
},
|
||||
|
||||
{
|
||||
-- LSP Configuration & Plugins
|
||||
'neovim/nvim-lspconfig',
|
||||
dependencies = {
|
||||
-- Automatically install LSPs to stdpath for neovim
|
||||
{ 'williamboman/mason.nvim', config = true },
|
||||
'williamboman/mason-lspconfig.nvim',
|
||||
|
||||
-- Useful status updates for LSP
|
||||
{ 'j-hui/fidget.nvim', tag = 'legacy', opts = {} },
|
||||
|
||||
-- Additional lua configuration, makes nvim stuff amazing!
|
||||
'folke/neodev.nvim',
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
-- Autocompletion
|
||||
'hrsh7th/nvim-cmp',
|
||||
dependencies = {
|
||||
-- Snippet Engine & its associated nvim-cmp source
|
||||
'L3MON4D3/LuaSnip',
|
||||
'saadparwaiz1/cmp_luasnip',
|
||||
|
||||
-- Adds LSP completion capabilities
|
||||
'hrsh7th/cmp-nvim-lsp',
|
||||
|
||||
-- Adds a number of user-friendly snippets
|
||||
'rafamadriz/friendly-snippets',
|
||||
},
|
||||
},
|
||||
|
||||
-- Show pending keybinds
|
||||
{ 'folke/which-key.nvim', opts = {} },
|
||||
|
||||
{
|
||||
'akinsho/toggleterm.nvim',
|
||||
keys = { '<C-_>', '<cmd>ToggleTerm<cr>', desc = 'Toggle term' },
|
||||
version = "*",
|
||||
opts = {
|
||||
direction = "float",
|
||||
open_mapping = [[<C-_>]],
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
'ThePrimeagen/harpoon',
|
||||
dependencies = { 'nvim-lua/plenary.nvim' },
|
||||
lazy = true,
|
||||
}
|
||||
}
|
||||
@ -1,28 +0,0 @@
|
||||
local function get_tab_idx(tab_id)
|
||||
for i, tabnr in ipairs(vim.api.nvim_list_tabpages()) do
|
||||
if tabnr == tab_id then
|
||||
return i
|
||||
end
|
||||
end
|
||||
return -1
|
||||
end
|
||||
|
||||
return {
|
||||
'LukasPietzschmann/telescope-tabs',
|
||||
dependencies = { 'nvim-telescope/telescope.nvim' },
|
||||
lazy = true,
|
||||
config = function()
|
||||
require 'telescope-tabs'.setup {
|
||||
entry_formatter = function(tab_id, buffer_ids, file_names, file_paths, is_current)
|
||||
local cwd = vim.fn.getcwd(-1, get_tab_idx(tab_id))
|
||||
local entry_string = table.concat(file_names, ', ')
|
||||
return string.format('%d: %s %s%s', tab_id, cwd, entry_string, is_current and ' <' or '')
|
||||
end,
|
||||
entry_ordinal = function(tab_id, buffer_ids, file_names, file_paths, is_current)
|
||||
local cwd = vim.fn.getcwd(-1, get_tab_idx(tab_id))
|
||||
local entry_string = table.concat(file_names, ', ')
|
||||
return string.format('%s %s', cwd, entry_string)
|
||||
end,
|
||||
}
|
||||
end
|
||||
}
|
||||
@ -1,3 +0,0 @@
|
||||
return {
|
||||
s("ct", t "-- TODO: ")
|
||||
}
|
||||
6
xsession/.xmodmaprc
Normal file
6
xsession/.xmodmaprc
Normal file
@ -0,0 +1,6 @@
|
||||
! make right windows key and menu key a hyper key
|
||||
remove mod4 = Super_R
|
||||
keycode 133 = Escape NoSymbol Escape
|
||||
keycode 134 = Hyper_R NoSymbol Hyper_R
|
||||
keycode 135 = Hyper_R NoSymbol Hyper_R
|
||||
add mod3 = Hyper_R
|
||||
@ -9,6 +9,7 @@ xrandr --auto
|
||||
xrandr --output HDMI1 --right-of DP1
|
||||
xrdb -merge ~/.Xresources
|
||||
setxkbmap pl -option ctrl:nocaps
|
||||
xmodmap ~/.xmodmaprc
|
||||
|
||||
if [ -x ~/.fehbg ]; then
|
||||
~/.fehbg &
|
||||
@ -29,10 +30,6 @@ xsetroot -cursor_name left_ptr
|
||||
|
||||
picom -b -I 1 -O 1 -i 1 -e 1 --no-fading-openclose || compton -b --no-fading-openclose
|
||||
|
||||
if which awesome > /dev/null; then
|
||||
exec awesome
|
||||
fi
|
||||
|
||||
if which dwm > /dev/null; then
|
||||
lupan-clock &
|
||||
exec dwm
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user