Compare commits
7 Commits
c665c5ba37
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 09bb156e47 | |||
|
1437d1826e | ||
|
2aa4027f9d | ||
|
|
704a095798 | ||
|
|
04bdd470fd | ||
|
|
3e2ee388e6 | ||
|
|
ee2bbcf84f |
@@ -1,5 +1,9 @@
|
||||
Xft.dpi: 96
|
||||
Xcursor.size: 16
|
||||
Xcursor.size: 6
|
||||
Xft.antialias: true
|
||||
Xft.hinting: true
|
||||
Xft.rgba: rgb
|
||||
Xft.hintstyle: hintslight
|
||||
! URxvt
|
||||
URxvt.font:xft:iM WritingMonoS Nerd Font:size=12
|
||||
URxvt.boldFont:xft:iM WritingMonoS Nerd Font:size=12:style=bold
|
||||
|
||||
@@ -12,39 +12,24 @@ local wibox = require("wibox")
|
||||
local beautiful = require("beautiful")
|
||||
-- Notification library
|
||||
local naughty = require("naughty")
|
||||
-- Declarative object management
|
||||
local ruled = require("ruled")
|
||||
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")
|
||||
|
||||
-- Load Debian menu entries
|
||||
local debian = require("debian.menu")
|
||||
local has_fdo, freedesktop = pcall(require, "freedesktop")
|
||||
|
||||
-- {{{ 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
|
||||
naughty.connect_signal("request::display_error", function(message, startup)
|
||||
naughty.notification {
|
||||
urgency = "critical",
|
||||
title = "Oops, an error happened"..(startup and " during startup!" or "!"),
|
||||
message = message
|
||||
}
|
||||
end)
|
||||
end
|
||||
-- }}}
|
||||
|
||||
-- {{{ Variable definitions
|
||||
@@ -52,7 +37,7 @@ end
|
||||
beautiful.init(gears.filesystem.get_configuration_dir() .. "my_theme.lua")
|
||||
|
||||
-- This is used later as the default terminal and editor to run.
|
||||
terminal = "/home/kmcr/.cargo/bin/alacritty"
|
||||
terminal = "/home/rkmiec/.cargo/bin/alacritty"
|
||||
editor = os.getenv("EDITOR") or "neovide"
|
||||
editor_cmd = terminal .. " -e " .. editor
|
||||
|
||||
@@ -62,26 +47,6 @@ editor_cmd = terminal .. " -e " .. editor
|
||||
-- I suggest you to remap Mod4 to another key using xmodmap or other tools.
|
||||
-- However, you can use another modifier like Mod1, but it may interact with others.
|
||||
modkey = "Mod4"
|
||||
|
||||
-- Table of layouts to cover with awful.layout.inc, order matters.
|
||||
awful.layout.layouts = {
|
||||
awful.layout.suit.floating,
|
||||
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,
|
||||
-- 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.corner.ne,
|
||||
-- awful.layout.suit.corner.sw,
|
||||
-- awful.layout.suit.corner.se,
|
||||
}
|
||||
-- }}}
|
||||
|
||||
-- {{{ Menu
|
||||
@@ -97,20 +62,12 @@ myawesomemenu = {
|
||||
local menu_awesome = { "awesome", myawesomemenu, beautiful.awesome_icon }
|
||||
local menu_terminal = { "open terminal", terminal }
|
||||
|
||||
if has_fdo then
|
||||
mymainmenu = freedesktop.menu.build({
|
||||
before = { menu_awesome },
|
||||
after = { menu_terminal }
|
||||
})
|
||||
else
|
||||
mymainmenu = awful.menu({
|
||||
items = {
|
||||
menu_awesome,
|
||||
{ "Debian", debian.menu.Debian_menu.Debian },
|
||||
menu_terminal,
|
||||
}
|
||||
})
|
||||
end
|
||||
|
||||
|
||||
mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
|
||||
@@ -120,10 +77,53 @@ mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon,
|
||||
menubar.utils.terminal = terminal -- Set the terminal for applications that require it
|
||||
-- }}}
|
||||
|
||||
-- {{{ Tag layout
|
||||
-- Table of layouts to cover with awful.layout.inc, order matters.
|
||||
tag.connect_signal("request::default_layouts", function()
|
||||
awful.layout.append_default_layouts({
|
||||
awful.layout.suit.floating,
|
||||
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,
|
||||
-- awful.layout.suit.spiral.dwindle,
|
||||
awful.layout.suit.max,
|
||||
awful.layout.suit.max.fullscreen,
|
||||
-- awful.layout.suit.magnifier,
|
||||
-- awful.layout.suit.corner.nw,
|
||||
})
|
||||
end)
|
||||
-- }}}
|
||||
|
||||
-- {{{ Wallpaper
|
||||
screen.connect_signal("request::wallpaper", function(s)
|
||||
-- awful.wallpaper {
|
||||
-- screen = s,
|
||||
-- widget = {
|
||||
-- {
|
||||
-- image = beautiful.wallpaper,
|
||||
-- upscale = true,
|
||||
-- downscale = true,
|
||||
-- widget = wibox.widget.imagebox,
|
||||
-- },
|
||||
-- valign = "center",
|
||||
-- halign = "center",
|
||||
-- tiled = false,
|
||||
-- widget = wibox.container.tile,
|
||||
-- }
|
||||
-- }
|
||||
awful.spawn.single_instance("feh --bg-scale /home/rkmiec/Downloads/a45eca3302b5d07d7f95b57f1df52f96.webp")
|
||||
end)
|
||||
-- }}}
|
||||
|
||||
-- {{{ Wibar
|
||||
|
||||
-- Keyboard map indicator and switcher
|
||||
mykeyboardlayout = awful.widget.keyboardlayout()
|
||||
|
||||
-- {{{ Wibar
|
||||
-- Create a textclock widget
|
||||
mytextclock = wibox.widget {
|
||||
format = "%a %y %m %_d - %_H %M %S",
|
||||
@@ -131,8 +131,35 @@ mytextclock = wibox.widget {
|
||||
widget = wibox.widget.textclock
|
||||
}
|
||||
|
||||
-- Create a wibox for each screen and add it
|
||||
local taglist_buttons = gears.table.join(
|
||||
screen.connect_signal("request::desktop_decoration", function(s)
|
||||
-- Each screen has its own tag table.
|
||||
if s.index == 1 then
|
||||
awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[3])
|
||||
else
|
||||
awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[2])
|
||||
end
|
||||
|
||||
-- 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 {
|
||||
screen = s,
|
||||
buttons = {
|
||||
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,
|
||||
--widget = wibox.container.rotate,
|
||||
buttons = {
|
||||
awful.button({ }, 1, function(t) t:view_only() end),
|
||||
awful.button({ modkey }, 1, function(t)
|
||||
if client.focus then
|
||||
@@ -145,74 +172,23 @@ local taglist_buttons = gears.table.join(
|
||||
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)
|
||||
)
|
||||
awful.button({ }, 4, function(t) awful.tag.viewprev(t.screen) end),
|
||||
awful.button({ }, 5, function(t) awful.tag.viewnext(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)
|
||||
-- Wallpaper
|
||||
if beautiful.wallpaper then
|
||||
local wallpaper = beautiful.wallpaper
|
||||
-- If wallpaper is a function, call it with the screen
|
||||
if type(wallpaper) == "function" then
|
||||
wallpaper = wallpaper(s)
|
||||
end
|
||||
gears.wallpaper.maximized(wallpaper, s, true)
|
||||
end
|
||||
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.
|
||||
if s.index == 1 then
|
||||
awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[3])
|
||||
else
|
||||
awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[2])
|
||||
end
|
||||
|
||||
-- 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 {
|
||||
-- Create a tasklist widget
|
||||
s.mytasklist = awful.widget.tasklist {
|
||||
screen = s,
|
||||
filter = awful.widget.taglist.filter.all,
|
||||
buttons = taglist_buttons,
|
||||
layout = wibox.layout.fixed.vertical,
|
||||
filter = awful.widget.tasklist.filter.currenttags,
|
||||
buttons = {
|
||||
awful.button({ }, 1, function (c)
|
||||
c:activate { context = "tasklist", action = "toggle_minimization" }
|
||||
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),
|
||||
}
|
||||
}
|
||||
|
||||
-- Create the wibox
|
||||
@@ -237,7 +213,6 @@ awful.screen.connect_for_each_screen(function(s)
|
||||
direction = s.rotation,
|
||||
widget = wibox.container.rotate
|
||||
}
|
||||
|
||||
-- Add widgets to the wibox
|
||||
s.mywibox:setup {
|
||||
layout = wibox.layout.align.vertical,
|
||||
@@ -257,27 +232,61 @@ awful.screen.connect_for_each_screen(function(s)
|
||||
},
|
||||
}
|
||||
end)
|
||||
|
||||
-- }}}
|
||||
|
||||
-- {{{ Mouse bindings
|
||||
root.buttons(gears.table.join(
|
||||
awful.mouse.append_global_mousebindings({
|
||||
awful.button({ }, 3, function () mymainmenu:toggle() end),
|
||||
awful.button({ }, 4, awful.tag.viewnext),
|
||||
awful.button({ }, 5, awful.tag.viewprev)
|
||||
))
|
||||
awful.button({ }, 4, awful.tag.viewprev),
|
||||
awful.button({ }, 5, awful.tag.viewnext),
|
||||
})
|
||||
-- }}}
|
||||
|
||||
-- {{{ Key bindings
|
||||
globalkeys = gears.table.join(
|
||||
|
||||
-- General Awesome keys
|
||||
awful.keyboard.append_global_keybindings({
|
||||
awful.key({ modkey, }, "s", hotkeys_popup.show_help,
|
||||
{description="show help", group="awesome"}),
|
||||
awful.key({ modkey, }, "w", function () mymainmenu:show() end,
|
||||
{description = "show main menu", group = "awesome"}),
|
||||
awful.key({ modkey, "Control" }, "r", awesome.restart,
|
||||
{description = "reload awesome", group = "awesome"}),
|
||||
awful.key({ modkey, "Shift" }, "c", awesome.quit,
|
||||
{description = "quit awesome", group = "awesome"}),
|
||||
-- awful.key({ modkey }, "y",
|
||||
-- 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"}),
|
||||
awful.key({ modkey, }, "Return", function () awful.spawn(terminal) end,
|
||||
{description = "open a terminal", group = "launcher"}),
|
||||
-- awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end,
|
||||
-- {description = "run prompt", group = "launcher"}),
|
||||
awful.key({ modkey, }, "d", function () awful.spawn(terminal) end,
|
||||
{description = "open a terminal", group = "launcher"}),
|
||||
awful.key({ modkey }, "p", function() menubar.show() end,
|
||||
{description = "show the menubar", group = "launcher"}),
|
||||
})
|
||||
|
||||
-- Tags related keybindings
|
||||
awful.keyboard.append_global_keybindings({
|
||||
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, }, "Escape", awful.tag.history.restore,
|
||||
{description = "go back", group = "tag"}),
|
||||
})
|
||||
|
||||
-- Focus related keybindings
|
||||
awful.keyboard.append_global_keybindings({
|
||||
awful.key({ modkey, }, "j",
|
||||
function ()
|
||||
awful.client.focus.byidx( 1)
|
||||
@@ -290,20 +299,6 @@ globalkeys = gears.table.join(
|
||||
end,
|
||||
{description = "focus previous by index", group = "client"}
|
||||
),
|
||||
awful.key({ modkey, }, "w", function () mymainmenu:show() end,
|
||||
{description = "show main menu", group = "awesome"}),
|
||||
|
||||
-- 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, }, "h", function () awful.screen.focus_relative( 1) end,
|
||||
{description = "focus the next screen", group = "screen"}),
|
||||
awful.key({ modkey, }, "l", 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, }, "Tab",
|
||||
function ()
|
||||
awful.client.focus.history.previous()
|
||||
@@ -312,15 +307,29 @@ globalkeys = gears.table.join(
|
||||
end
|
||||
end,
|
||||
{description = "go back", group = "client"}),
|
||||
awful.key({ modkey, "Control" }, "h", function () awful.screen.focus_relative( 1) end,
|
||||
{description = "focus the next screen", group = "screen"}),
|
||||
awful.key({ modkey, "Control" }, "l", function () awful.screen.focus_relative(-1) end,
|
||||
{description = "focus the previous screen", group = "screen"}),
|
||||
awful.key({ modkey, "Control" }, "n",
|
||||
function ()
|
||||
local c = awful.client.restore()
|
||||
-- Focus restored client
|
||||
if c then
|
||||
c:activate { raise = true, context = "key.unminimize" }
|
||||
end
|
||||
end,
|
||||
{description = "restore minimized", group = "client"}),
|
||||
})
|
||||
|
||||
-- Standard program
|
||||
awful.key({ modkey, }, "Return", function () awful.spawn(terminal) end,
|
||||
{description = "open a terminal", group = "launcher"}),
|
||||
awful.key({ modkey, "Control" }, "r", awesome.restart,
|
||||
{description = "reload awesome", group = "awesome"}),
|
||||
awful.key({ modkey, "Shift" }, "c", awesome.quit,
|
||||
{description = "quit awesome", group = "awesome"}),
|
||||
|
||||
-- Layout related keybindings
|
||||
awful.keyboard.append_global_keybindings({
|
||||
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, }, "u", awful.client.urgent.jumpto,
|
||||
{description = "jump to urgent client", group = "client"}),
|
||||
awful.key({ modkey, "Control" }, "j", function () awful.tag.incmwfact( 0.05) end,
|
||||
{description = "increase master width factor", group = "layout"}),
|
||||
awful.key({ modkey, "Control" }, "k", function () awful.tag.incmwfact(-0.05) end,
|
||||
@@ -337,39 +346,94 @@ globalkeys = gears.table.join(
|
||||
{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" }, "n",
|
||||
function ()
|
||||
local c = awful.client.restore()
|
||||
-- Focus restored client
|
||||
if c then
|
||||
c:emit_signal(
|
||||
"request::activate", "key.unminimize", {raise = true}
|
||||
)
|
||||
|
||||
awful.keyboard.append_global_keybindings({
|
||||
awful.key {
|
||||
modifiers = { modkey },
|
||||
keygroup = "numrow",
|
||||
description = "only view tag",
|
||||
group = "tag",
|
||||
on_press = function (index)
|
||||
local screen = awful.screen.focused()
|
||||
local tag = screen.tags[index]
|
||||
if tag then
|
||||
tag:view_only()
|
||||
end
|
||||
end,
|
||||
{description = "restore minimized", group = "client"}),
|
||||
},
|
||||
awful.key {
|
||||
modifiers = { modkey, "Control" },
|
||||
keygroup = "numrow",
|
||||
description = "toggle tag",
|
||||
group = "tag",
|
||||
on_press = function (index)
|
||||
local screen = awful.screen.focused()
|
||||
local tag = screen.tags[index]
|
||||
if tag then
|
||||
awful.tag.viewtoggle(tag)
|
||||
end
|
||||
end,
|
||||
},
|
||||
awful.key {
|
||||
modifiers = { modkey, "Shift" },
|
||||
keygroup = "numrow",
|
||||
description = "move focused client to tag",
|
||||
group = "tag",
|
||||
on_press = function (index)
|
||||
if client.focus then
|
||||
local tag = client.focus.screen.tags[index]
|
||||
if tag then
|
||||
client.focus:move_to_tag(tag)
|
||||
end
|
||||
end
|
||||
end,
|
||||
},
|
||||
awful.key {
|
||||
modifiers = { modkey, "Control", "Shift" },
|
||||
keygroup = "numrow",
|
||||
description = "toggle focused client on tag",
|
||||
group = "tag",
|
||||
on_press = function (index)
|
||||
if client.focus then
|
||||
local tag = client.focus.screen.tags[index]
|
||||
if tag then
|
||||
client.focus:toggle_tag(tag)
|
||||
end
|
||||
end
|
||||
end,
|
||||
},
|
||||
awful.key {
|
||||
modifiers = { modkey },
|
||||
keygroup = "numpad",
|
||||
description = "select layout directly",
|
||||
group = "layout",
|
||||
on_press = function (index)
|
||||
local t = awful.screen.focused().selected_tag
|
||||
if t then
|
||||
t.layout = t.layouts[index] or t.layout
|
||||
end
|
||||
end,
|
||||
}
|
||||
})
|
||||
|
||||
-- -- Prompt
|
||||
-- awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end,
|
||||
-- {description = "run prompt", group = "launcher"}),
|
||||
client.connect_signal("request::default_mousebindings", function()
|
||||
awful.mouse.append_client_mousebindings({
|
||||
awful.button({ }, 1, function (c)
|
||||
c:activate { context = "mouse_click" }
|
||||
end),
|
||||
awful.button({ modkey }, 1, function (c)
|
||||
c:activate { context = "mouse_click", action = "mouse_move" }
|
||||
end),
|
||||
awful.button({ modkey }, 3, function (c)
|
||||
c:activate { context = "mouse_click", action = "mouse_resize"}
|
||||
end),
|
||||
})
|
||||
end)
|
||||
|
||||
-- awful.key({ modkey }, "y",
|
||||
-- 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(
|
||||
client.connect_signal("request::default_keybindings", function()
|
||||
awful.keyboard.append_client_keybindings({
|
||||
awful.key({ modkey, }, "f",
|
||||
function (c)
|
||||
c.fullscreen = not c.fullscreen
|
||||
@@ -410,112 +474,39 @@ clientkeys = gears.table.join(
|
||||
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)
|
||||
{description = "(un)maximize horizontally", group = "client"}),
|
||||
})
|
||||
end)
|
||||
)
|
||||
|
||||
-- Set keys
|
||||
root.keys(globalkeys)
|
||||
-- }}}
|
||||
|
||||
-- {{{ Rules
|
||||
-- Rules to apply to new clients (through the "manage" signal).
|
||||
awful.rules.rules = {
|
||||
-- Rules to apply to new clients.
|
||||
ruled.client.connect_signal("request::rules", function()
|
||||
-- All clients will match this rule.
|
||||
{ rule = { },
|
||||
properties = { border_width = beautiful.border_width,
|
||||
border_color = beautiful.border_normal,
|
||||
ruled.client.append_rule {
|
||||
id = "global",
|
||||
rule = { },
|
||||
properties = {
|
||||
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 = {
|
||||
ruled.client.append_rule {
|
||||
id = "floating",
|
||||
rule_any = {
|
||||
instance = {
|
||||
"DTA", -- Firefox addon DownThemAll.
|
||||
"copyq", -- Includes session name in class.
|
||||
"pinentry",
|
||||
},
|
||||
"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"},
|
||||
|
||||
"Arandr", "Blueman-manager", "Gpick", "Sxiv",
|
||||
"Tor Browser", "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 = {
|
||||
@@ -526,12 +517,16 @@ awful.rules.rules = {
|
||||
"ConfigManager", -- Thunderbird's about:config.
|
||||
"pop-up", -- e.g. Google Chrome's (detached) Developer Tools.
|
||||
}
|
||||
}, properties = { floating = true }},
|
||||
},
|
||||
properties = { floating = true }
|
||||
}
|
||||
|
||||
-- Add titlebars to normal clients and dialogs
|
||||
{ rule_any = {type = { "normal", "dialog" }
|
||||
}, properties = { titlebars_enabled = false }
|
||||
},
|
||||
ruled.client.append_rule {
|
||||
id = "titlebars",
|
||||
rule_any = { type = { "normal", "dialog" } },
|
||||
properties = { titlebars_enabled = false }
|
||||
}
|
||||
|
||||
-- Set Firefox to always map on the tag named "1" on screen 1 and disable
|
||||
-- title for that window
|
||||
@@ -541,39 +536,23 @@ awful.rules.rules = {
|
||||
-- properties = { screen = 1, tag = "1", titlebars_enabled = false } },
|
||||
--{ rule = { class = "Google-chrome-beta" },
|
||||
-- properties = { screen = 1, tag = "1", titlebars_enabled = false } },
|
||||
}
|
||||
end)
|
||||
-- }}}
|
||||
|
||||
-- {{{ 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)
|
||||
|
||||
-- {{{ Titlebars
|
||||
-- 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(
|
||||
local buttons = {
|
||||
awful.button({ }, 1, function()
|
||||
c:emit_signal("request::activate", "titlebar", {raise = true})
|
||||
awful.mouse.client.move(c)
|
||||
c:activate { context = "titlebar", action = "mouse_move" }
|
||||
end),
|
||||
awful.button({ }, 3, function()
|
||||
c:emit_signal("request::activate", "titlebar", {raise = true})
|
||||
awful.mouse.client.resize(c)
|
||||
end)
|
||||
)
|
||||
c:activate { context = "titlebar", action = "mouse_resize"}
|
||||
end),
|
||||
}
|
||||
|
||||
awful.titlebar(c) : setup {
|
||||
awful.titlebar(c).widget = {
|
||||
{ -- Left
|
||||
awful.titlebar.widget.iconwidget(c),
|
||||
buttons = buttons,
|
||||
@@ -581,7 +560,7 @@ client.connect_signal("request::titlebars", function(c)
|
||||
},
|
||||
{ -- Middle
|
||||
{ -- Title
|
||||
align = "center",
|
||||
halign = "center",
|
||||
widget = awful.titlebar.widget.titlewidget(c)
|
||||
},
|
||||
buttons = buttons,
|
||||
@@ -598,15 +577,34 @@ client.connect_signal("request::titlebars", function(c)
|
||||
layout = wibox.layout.align.horizontal
|
||||
}
|
||||
end)
|
||||
-- }}}
|
||||
|
||||
-- {{{ Notifications
|
||||
|
||||
ruled.notification.connect_signal('request::rules', function()
|
||||
-- All notifications will match this rule.
|
||||
ruled.notification.append_rule {
|
||||
rule = { },
|
||||
properties = {
|
||||
screen = awful.screen.preferred,
|
||||
implicit_timeout = 5,
|
||||
}
|
||||
}
|
||||
end)
|
||||
|
||||
naughty.connect_signal("request::display", function(n)
|
||||
naughty.layout.box { notification = n }
|
||||
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})
|
||||
c:activate { context = "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)
|
||||
-- }}}
|
||||
|
||||
awful.spawn.with_shell(
|
||||
'if (xrdb -query | grep -q "^awesome\\.started:\\s*true$"); then exit; fi;' ..
|
||||
@@ -620,11 +618,11 @@ do
|
||||
{
|
||||
"xset b off",
|
||||
"xdotool key --clearmodifiers Num_Lock",
|
||||
"autorandr -c",
|
||||
--"autorandr -c",
|
||||
"pasystray -m 100",
|
||||
"cbatticon",
|
||||
"barrierc --disable-crypto 192.168.10.2:24800",
|
||||
"xbindkeys -f /home/kmcr/.config/xbindkeysrc",
|
||||
--"cbatticon",
|
||||
--"barrierc --disable-crypto 192.168.10.2:24800",
|
||||
"xbindkeys -f /home/rkmiec/.config/xbindkeysrc",
|
||||
}
|
||||
for _,i in ipairs(cmds_once) do
|
||||
awful.spawn(i)
|
||||
@@ -632,10 +630,10 @@ do
|
||||
--"dunst -config /home/kmcr/.config/i3/dunst_config",
|
||||
local cmds_single_instance =
|
||||
{
|
||||
"nm-applet",
|
||||
--"nm-applet",
|
||||
"blueman-applet",
|
||||
"flameshot",
|
||||
"feh --no-xinerama --bg-scale /home/kmcr/.config/i3/wallpaper.jpg",
|
||||
"feh --bg-scale /home/rkmiec/Downloads/a45eca3302b5d07d7f95b57f1df52f96.webp",
|
||||
}
|
||||
for _,i in ipairs(cmds_single_instance) do
|
||||
awful.spawn.single_instance(i)
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
# start a terminal
|
||||
bindsym Mod4+t exec ~/.cargo/bin/alacritty
|
||||
|
||||
# Use pulseaudio-ctl to adjust volume in PulseAudio.
|
||||
bindsym XF86AudioRaiseVolume exec pulseaudio-ctl up && $refresh_i3status
|
||||
bindsym XF86AudioLowerVolume exec pulseaudio-ctl down && $refresh_i3status
|
||||
bindsym XF86AudioMute exec pulseaudio-ctl mute && $refresh_i3status
|
||||
bindsym XF86AudioMicMute exec pulseaudio-ctl mute-input
|
||||
bindsym XF86AudioPlay exec playerctl --ignore-player=chromium play-pause
|
||||
bindsym XF86AudioPause exec playerctl --ignore-player=chromium play-pause
|
||||
bindsym XF86AudioStop exec playerctl --ignore-player=chromium stop
|
||||
bindsym XF86AudioNext exec playerctl --ignore-player=chromium next
|
||||
bindsym XF86AudioPrev exec playerctl --ignore-player=chromium previous
|
||||
|
||||
bindsym XF86Calculator exec --no-startup-id gnome-calculator
|
||||
|
||||
# System state management
|
||||
bindsym Pause exec systemctl suspend
|
||||
bindsym Mod4+z exec i3lock -c 151515 -e -f
|
||||
|
||||
# Screen brightness controls
|
||||
bindsym Mod1+Up exec brightnessctl s 5\%+
|
||||
bindsym Mod1+Down exec brightnessctl s 5\%-
|
||||
|
||||
# start rofi (a program launcher)
|
||||
bindsym Mod4+d exec --no-startup-id "rofi -show run"
|
||||
bindsym Mod4+Shift+d exec --no-startup-id "rofi -show window"
|
||||
bindsym Mod1+Tab exec --no-startup-id "rofi -show window"
|
||||
bindsym Mod4+ctrl+d exec rofi-pass
|
||||
@@ -1,28 +0,0 @@
|
||||
# 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
|
||||
|
||||
# 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
|
||||
|
||||
exec setxkbmap pl
|
||||
exec --no-startup-id dunst -config ~/.config/i3/dunst_config
|
||||
exec --no-startup-id pasystray -m 100
|
||||
exec --no-startup-id blueman-applet
|
||||
exec --no-startup-id xset b off
|
||||
exec --no-startup-id flameshot
|
||||
exec --no-startup-id autorandr -c
|
||||
exec --no-startup-id wal -n -i ~/.config/i3/wallpaper.jpg
|
||||
exec --no-startup-id feh --no-xinerama --bg-scale ~/.config/i3/wallpaper.jpg
|
||||
exec --no-startup-id xdotool key --clearmodifiers Num_Lock
|
||||
#exec --no-startup-id unclutter # generates some issues on work laptop
|
||||
#exec --no-startup-id barriers -c ~/.config/barrier.conf --screen-change-script ~/.local/bin/switch_pc.sh
|
||||
exec --no-startup-id barrierc 192.168.10.2:24800
|
||||
@@ -1,14 +1,8 @@
|
||||
# i3 config file (v4)
|
||||
#
|
||||
# Please see https://i3wm.org/docs/userguide.html for a complete reference!
|
||||
#
|
||||
# This config file uses keycodes (bindsym) and was written for the QWERTY
|
||||
# layout.
|
||||
#
|
||||
# To get a config file with the same key positions, but for your current
|
||||
# layout, use the i3-config-wizard
|
||||
#
|
||||
|
||||
set $mod Mod4
|
||||
set_from_resource $main_color i3wm.color1 #fdff00
|
||||
set_from_resource $secondary_color i3wm.color0 #98d1ce
|
||||
set_from_resource $bg_color i3wm.color4 #0c1014
|
||||
@@ -18,14 +12,14 @@ set $refresh_i3status killall -SIGUSR1 i3status-rs
|
||||
|
||||
# Font for window titles. Will also be used by the bar unless a different font
|
||||
# is used in the bar {} block below.
|
||||
font Monoid Nerd Font 9
|
||||
font pango:CommitMonotuned 9
|
||||
|
||||
# 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
|
||||
|
||||
include conf.d/exec.conf
|
||||
include conf.d/binds.conf
|
||||
include exec.conf
|
||||
#include binds.conf
|
||||
|
||||
# use these keys for focus, movement, and resize directions when reaching for
|
||||
# the arrows is not convenient
|
||||
@@ -34,68 +28,84 @@ set $down j
|
||||
set $up k
|
||||
set $right l
|
||||
|
||||
# use Mouse+Mod4 to drag floating windows to their wanted position
|
||||
floating_modifier Mod4
|
||||
# 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
|
||||
set $TERMINAL ~/.cargo/bin/wezterm
|
||||
bindsym $mod+t exec $TERMINAL
|
||||
|
||||
# kill focused window
|
||||
bindsym Mod4+Shift+q kill
|
||||
bindsym $mod+Shift+q kill
|
||||
|
||||
# start dmenu (a program launcher)
|
||||
bindsym $mod+d exec --no-startup-id dmenu_run
|
||||
# A more modern dmenu replacement is rofi:
|
||||
# bindcode $mod+40 exec "rofi -modi drun,run -show drun"
|
||||
# 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 Mod4+$left focus left
|
||||
bindsym Mod4+$down focus down
|
||||
bindsym Mod4+$up focus up
|
||||
bindsym Mod4+$right focus right
|
||||
bindsym $mod+$left focus left
|
||||
bindsym $mod+$down focus down
|
||||
bindsym $mod+$up focus up
|
||||
bindsym $mod+$right focus right
|
||||
|
||||
# alternatively, you can use the cursor keys:
|
||||
bindsym Mod4+Left focus left
|
||||
bindsym Mod4+Down focus down
|
||||
bindsym Mod4+Up focus up
|
||||
bindsym Mod4+Right focus right
|
||||
bindsym $mod+Left focus left
|
||||
bindsym $mod+Down focus down
|
||||
bindsym $mod+Up focus up
|
||||
bindsym $mod+Right focus right
|
||||
|
||||
# move focused window
|
||||
bindsym Mod4+Shift+$left move left
|
||||
bindsym Mod4+Shift+$down move down
|
||||
bindsym Mod4+Shift+$up move up
|
||||
bindsym Mod4+Shift+$right move 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
|
||||
|
||||
# alternatively, you can use the cursor keys:
|
||||
bindsym Mod4+Shift+Left move left
|
||||
bindsym Mod4+Shift+Down move down
|
||||
bindsym Mod4+Shift+Up move up
|
||||
bindsym Mod4+Shift+Right move 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 Mod4+b split h
|
||||
bindsym $mod+semicolon split h
|
||||
|
||||
# split in vertical orientation
|
||||
bindsym Mod4+v split v
|
||||
bindsym $mod+v split v
|
||||
|
||||
# enter fullscreen mode for the focused container
|
||||
bindsym Mod4+f fullscreen toggle
|
||||
bindsym $mod+f fullscreen toggle
|
||||
|
||||
# change container layout (stacked, tabbed, toggle split)
|
||||
bindsym Mod4+q layout stacking
|
||||
bindsym Mod4+w layout tabbed
|
||||
bindsym Mod4+e layout toggle split
|
||||
bindsym $mod+q layout stacking
|
||||
bindsym $mod+w layout tabbed
|
||||
bindsym $mod+e layout toggle split
|
||||
|
||||
# toggle tiling / floating
|
||||
bindsym Mod4+Shift+space floating toggle
|
||||
bindsym $mod+Shift+space floating toggle
|
||||
|
||||
# change focus between tiling / floating windows
|
||||
bindsym Mod4+space focus mode_toggle
|
||||
bindsym $mod+space focus mode_toggle
|
||||
|
||||
# focus the parent container
|
||||
bindsym Mod4+a focus parent
|
||||
bindsym $mod+a focus parent
|
||||
|
||||
# focus the child container
|
||||
#bindsym Mod4+d focus child
|
||||
#bindsym $mod+d focus child
|
||||
|
||||
# move the currently focused window to the scratchpad
|
||||
bindsym Mod4+m move scratchpad
|
||||
bindsym $mod+m move scratchpad
|
||||
|
||||
# Show the next scratchpad window or hide the focused scratchpad window.
|
||||
# If there are multiple scratchpad windows, this command cycles through them.
|
||||
bindsym Mod4+s scratchpad show
|
||||
bindsym $mod+s scratchpad show
|
||||
|
||||
# Define names for default workspaces for which we configure key bindings later on.
|
||||
# We use variables to avoid repeating the names in multiple places.
|
||||
@@ -109,90 +119,38 @@ set $ws7 " 7 "
|
||||
set $ws8 " 8 "
|
||||
set $ws9 " 9 "
|
||||
set $ws10 " 10 "
|
||||
set $ws11 " 11 "
|
||||
set $ws12 " 12 "
|
||||
set $ws13 " 13 "
|
||||
set $ws14 " 14 "
|
||||
set $ws15 " 15 "
|
||||
set $ws16 " 16 "
|
||||
set $ws17 " 17 "
|
||||
set $ws18 " 18 "
|
||||
set $ws19 " 19 "
|
||||
set $ws20 " 20 "
|
||||
|
||||
workspace $ws1 output $output_main
|
||||
workspace $ws2 output $output_main
|
||||
workspace $ws3 output $output_main
|
||||
workspace $ws4 output $output_main
|
||||
workspace $ws5 output $output_main
|
||||
workspace $ws6 output $output_main
|
||||
workspace $ws7 output $output_main
|
||||
workspace $ws8 output $output_main
|
||||
workspace $ws9 output $output_main
|
||||
workspace $ws10 output $output_main
|
||||
workspace $ws11 output $output_secondary
|
||||
workspace $ws12 output $output_secondary
|
||||
workspace $ws13 output $output_secondary
|
||||
workspace $ws14 output $output_secondary
|
||||
workspace $ws15 output $output_secondary
|
||||
workspace $ws16 output $output_secondary
|
||||
workspace $ws17 output $output_secondary
|
||||
workspace $ws18 output $output_secondary
|
||||
workspace $ws19 output $output_secondary
|
||||
workspace $ws20 output $output_secondary
|
||||
|
||||
# switch to workspace
|
||||
bindsym Mod4+1 workspace number $ws1
|
||||
bindsym Mod4+2 workspace number $ws2
|
||||
bindsym Mod4+3 workspace number $ws3
|
||||
bindsym Mod4+4 workspace number $ws4
|
||||
bindsym Mod4+5 workspace number $ws5
|
||||
bindsym Mod4+6 workspace number $ws6
|
||||
bindsym Mod4+7 workspace number $ws7
|
||||
bindsym Mod4+8 workspace number $ws8
|
||||
bindsym Mod4+9 workspace number $ws9
|
||||
bindsym Mod4+0 workspace number $ws10
|
||||
bindsym Mod1+1 workspace number $ws11
|
||||
bindsym Mod1+2 workspace number $ws12
|
||||
bindsym Mod1+3 workspace number $ws13
|
||||
bindsym Mod1+4 workspace number $ws14
|
||||
bindsym Mod1+5 workspace number $ws15
|
||||
bindsym Mod1+6 workspace number $ws16
|
||||
bindsym Mod1+7 workspace number $ws17
|
||||
bindsym Mod1+8 workspace number $ws18
|
||||
bindsym Mod1+9 workspace number $ws19
|
||||
bindsym Mod1+0 workspace number $ws20
|
||||
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 Mod4+Shift+1 move container to workspace number $ws1
|
||||
bindsym Mod4+Shift+2 move container to workspace number $ws2
|
||||
bindsym Mod4+Shift+3 move container to workspace number $ws3
|
||||
bindsym Mod4+Shift+4 move container to workspace number $ws4
|
||||
bindsym Mod4+Shift+5 move container to workspace number $ws5
|
||||
bindsym Mod4+Shift+6 move container to workspace number $ws6
|
||||
bindsym Mod4+Shift+7 move container to workspace number $ws7
|
||||
bindsym Mod4+Shift+8 move container to workspace number $ws8
|
||||
bindsym Mod4+Shift+9 move container to workspace number $ws9
|
||||
bindsym Mod4+Shift+0 move container to workspace number $ws10
|
||||
bindsym Mod1+Shift+1 move container to workspace number $ws11
|
||||
bindsym Mod1+Shift+2 move container to workspace number $ws12
|
||||
bindsym Mod1+Shift+3 move container to workspace number $ws13
|
||||
bindsym Mod1+Shift+4 move container to workspace number $ws14
|
||||
bindsym Mod1+Shift+5 move container to workspace number $ws15
|
||||
bindsym Mod1+Shift+6 move container to workspace number $ws16
|
||||
bindsym Mod1+Shift+7 move container to workspace number $ws17
|
||||
bindsym Mod1+Shift+8 move container to workspace number $ws18
|
||||
bindsym Mod1+Shift+9 move container to workspace number $ws19
|
||||
bindsym Mod1+Shift+0 move container to workspace number $ws20
|
||||
|
||||
bindsym Mod4+n exec i3-new-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+n exec i3-new-workspace
|
||||
|
||||
# reload the configuration file
|
||||
bindsym Mod4+Shift+c reload
|
||||
bindsym $mod+Shift+c reload
|
||||
# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
|
||||
bindsym Mod4+Shift+r restart
|
||||
bindsym $mod+Shift+r restart
|
||||
# exit i3 (logs you out of your X session)
|
||||
bindsym Mod4+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'"
|
||||
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" {
|
||||
@@ -208,29 +166,26 @@ mode "resize" {
|
||||
bindsym $right resize grow width 10 px or 10 ppt
|
||||
|
||||
# same bindings, but for the arrow keys
|
||||
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 Left resize shrink width 5 px or 5 ppt
|
||||
bindsym Down resize grow height 5 px or 5 ppt
|
||||
bindsym Up resize shrink height 5 px or 5 ppt
|
||||
bindsym Right resize grow width 5 px or 5 ppt
|
||||
|
||||
# back to normal: Enter or Escape or Mod4+r
|
||||
# back to normal: Enter or Escape or $mod+r
|
||||
bindsym Return mode "default"
|
||||
bindsym Escape mode "default"
|
||||
bindsym Mod4+r mode "default"
|
||||
bindsym $mod+r mode "default"
|
||||
}
|
||||
|
||||
bindsym Mod4+r mode "resize"
|
||||
bindsym $mod+r mode "resize"
|
||||
|
||||
# Start i3bar to display a workspace bar (plus the system information i3status
|
||||
# finds out, if available)
|
||||
bar {
|
||||
font pango:Monoid Nerd Font 9
|
||||
status_command ~/.cargo/bin/i3status-rs ~/.config/i3/i3status-rs.toml
|
||||
mode dock
|
||||
modifier Mod4
|
||||
tray_padding 0
|
||||
tray_output primary
|
||||
|
||||
mode hide
|
||||
status_command i3status-rs ~/.config/i3/i3status-rs.toml
|
||||
modifier $mod
|
||||
font pango:CommitMonotuned 9
|
||||
colors {
|
||||
separator #268bd2
|
||||
background $bg_color
|
||||
@@ -255,8 +210,8 @@ for_window [title="Figure *"] move container to workspace $ws10 floating enable
|
||||
assign [class="com-mathworks-util-PostVMInit" title="^Fig"] $ws10
|
||||
|
||||
#without borders
|
||||
new_window pixel 1
|
||||
new_float pixel 3
|
||||
default_border pixel 2
|
||||
default_floating_border pixel 3
|
||||
hide_edge_borders smart
|
||||
#focus_on_window_activation focus
|
||||
focus_on_window_activation urgent
|
||||
|
||||
@@ -1,40 +1,52 @@
|
||||
theme = "solarized-dark"
|
||||
[icons]
|
||||
icons = "awesome"
|
||||
|
||||
[[block]]
|
||||
block = "custom"
|
||||
command = "echo vpn:(vpn | head -1 | cut -d: -f 2)"
|
||||
interval = 5
|
||||
[theme]
|
||||
theme = "solarized-dark"
|
||||
|
||||
[[block]]
|
||||
block = "disk_space"
|
||||
path = "/home"
|
||||
alias = "~"
|
||||
info_type = "available"
|
||||
unit = "GB"
|
||||
alert_unit = "GB"
|
||||
interval = 20
|
||||
warning = 20.0
|
||||
alert = 10.0
|
||||
format = " $icon home: $available.eng(w:2) "
|
||||
|
||||
[[block]]
|
||||
block = "disk_space"
|
||||
path = "/"
|
||||
info_type = "available"
|
||||
alert_unit = "GB"
|
||||
interval = 20
|
||||
warning = 20.0
|
||||
alert = 10.0
|
||||
format = " $icon root: $available.eng(w:2) "
|
||||
|
||||
[[block]]
|
||||
block = "memory"
|
||||
display_type = "memory"
|
||||
format_mem = "{mem_total_used_percents}"
|
||||
format_swap = "{swap_used_percents}"
|
||||
format = " $icon $mem_total_used_percents.eng(w:2) "
|
||||
format_alt = " $icon_swap $swap_used_percents.eng(w:2) "
|
||||
|
||||
[[block]]
|
||||
block = "amd_gpu"
|
||||
format = " $icon $utilization "
|
||||
format_alt = " $icon MEM: $vram_used_percents ($vram_used/$vram_total) "
|
||||
interval = 1
|
||||
|
||||
[[block]]
|
||||
block = "cpu"
|
||||
interval = 1
|
||||
info_cpu = 20
|
||||
warning_cpu = 50
|
||||
critical_cpu = 90
|
||||
|
||||
[[block]]
|
||||
block = "load"
|
||||
interval = 1
|
||||
format = "{1m}"
|
||||
|
||||
[[block]]
|
||||
block = "sound"
|
||||
format = " $icon 1min avg: $1m.eng(w:4) "
|
||||
|
||||
[[block]]
|
||||
block = "time"
|
||||
interval = 60
|
||||
format = "%a %d.%m %R"
|
||||
interval = 5
|
||||
format = " $timestamp.datetime(f:'%a %F %T') "
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 520 KiB |
@@ -39,9 +39,9 @@ vim.g.neovide_remember_window_size = 0
|
||||
|
||||
vim.opt.listchars = { tab = "▸ ", trail = "¬" }
|
||||
vim.opt.list = true
|
||||
vim.opt.tabstop=2
|
||||
vim.opt.shiftwidth=2
|
||||
vim.opt.softtabstop=2
|
||||
vim.opt.tabstop=4
|
||||
vim.opt.shiftwidth=4
|
||||
vim.opt.softtabstop=4
|
||||
|
||||
vim.opt.expandtab = true
|
||||
|
||||
|
||||
@@ -14,12 +14,13 @@ vim.g.mapleader = ' '
|
||||
vim.g.maplocalleader = ' '
|
||||
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
require'lazy'.setup('plugins', {
|
||||
change_detection = {
|
||||
enabled = true,
|
||||
notify = false
|
||||
},
|
||||
dev = {
|
||||
path = '/home/kmcr'
|
||||
}
|
||||
})
|
||||
require'lazy'.setup('plugins')
|
||||
-- , {
|
||||
-- change_detection = {
|
||||
-- enabled = false,
|
||||
-- notify = false
|
||||
-- },
|
||||
-- dev = {
|
||||
-- path = '/home/kmcr'
|
||||
-- }
|
||||
-- })
|
||||
|
||||
@@ -7,5 +7,6 @@ return {
|
||||
-- dev = true,
|
||||
config = function()
|
||||
require('bitbucket-nvim').setup({ opt = "test"})
|
||||
end
|
||||
end,
|
||||
enabled = false
|
||||
}
|
||||
|
||||
@@ -6,6 +6,8 @@ return { {
|
||||
'xzbdmw/colorful-menu.nvim',
|
||||
'disrupted/blink-cmp-conventional-commits',
|
||||
'moyiz/blink-emoji.nvim',
|
||||
'milanglacier/minuet-ai.nvim',
|
||||
'mikavilpas/blink-ripgrep.nvim',
|
||||
},
|
||||
|
||||
-- use a release tag to download pre-built binaries
|
||||
@@ -22,7 +24,10 @@ return { {
|
||||
-- 'super-tab' for mappings similar to vscode (tab to accept, arrow keys to navigate)
|
||||
-- 'enter' for mappings similar to 'super-tab' but with 'enter' to accept
|
||||
-- See the full "keymap" documentation for information on defining your own keymap.
|
||||
keymap = { preset = 'default' },
|
||||
keymap = {
|
||||
preset = 'default',
|
||||
--['A-y'] = require('minuet').make_blink_map()
|
||||
},
|
||||
|
||||
appearance = {
|
||||
-- -- Sets the fallback highlight groups to nvim-cmp's highlight groups
|
||||
@@ -37,7 +42,16 @@ return { {
|
||||
-- Default list of enabled providers defined so that you can extend it
|
||||
-- elsewhere in your config, without redefining it, due to `opts_extend`
|
||||
sources = {
|
||||
default = { 'conventional_commits', 'lsp', 'path', 'snippets', 'buffer', 'emoji', 'codecompanion' },
|
||||
default = {
|
||||
'conventional_commits',
|
||||
'lsp',
|
||||
'path',
|
||||
'snippets',
|
||||
'buffer',
|
||||
'emoji',
|
||||
--'ripgrep',
|
||||
--[[ 'minuet' ]]
|
||||
},
|
||||
providers = {
|
||||
conventional_commits = {
|
||||
name = "Conventional Commits",
|
||||
@@ -55,7 +69,21 @@ return { {
|
||||
should_show_items = function()
|
||||
return vim.tbl_contains({ "gitcommit", "markdown" }, vim.o.filetype)
|
||||
end,
|
||||
}
|
||||
},
|
||||
minuet = {
|
||||
name = 'minuet',
|
||||
module = 'minuet.blink',
|
||||
async = true,
|
||||
-- Should match minuet.config.request_timeout * 1000,
|
||||
-- since minuet.config.request_timeout is in seconds
|
||||
timeout_ms = 3000,
|
||||
score_offset = 50, -- Gives minuet higher priority among suggestions
|
||||
},
|
||||
ripgrep = {
|
||||
module = 'blink-ripgrep',
|
||||
name = 'Ripgrep',
|
||||
opts = {},
|
||||
},
|
||||
}
|
||||
},
|
||||
|
||||
@@ -75,6 +103,7 @@ return { {
|
||||
}
|
||||
}
|
||||
},
|
||||
--trigger = { prefetch_on_insert = false },
|
||||
|
||||
accept = { auto_brackets = { enabled = false }, },
|
||||
ghost_text = { enabled = false },
|
||||
|
||||
@@ -31,7 +31,7 @@ return {
|
||||
},
|
||||
schema = {
|
||||
model = {
|
||||
default = "gemma3:12b",
|
||||
default = "deepseek-r1:32b",
|
||||
},
|
||||
num_ctx = {
|
||||
default = 16384,
|
||||
@@ -45,4 +45,5 @@ return {
|
||||
log_level = "DEBUG",
|
||||
},
|
||||
},
|
||||
enabled = false
|
||||
}
|
||||
|
||||
@@ -43,6 +43,10 @@ return {
|
||||
'ficcdaf/ashen.nvim',
|
||||
-- 'm15a/nvim-srcerite', - requires buggy highlite
|
||||
'nyoom-engineering/oxocarbon.nvim',
|
||||
'rjshkhr/shadow.nvim',
|
||||
'folke/tokyonight.nvim',
|
||||
'nendix/zen.nvim',
|
||||
'mcauley-penney/techbase.nvim',
|
||||
'default'
|
||||
})
|
||||
end
|
||||
|
||||
@@ -1,5 +1,23 @@
|
||||
return {
|
||||
return {{
|
||||
-- 'gcc' to toggle comments
|
||||
'numToStr/Comment.nvim',
|
||||
config = true
|
||||
}
|
||||
}, {
|
||||
"soemre/commentless.nvim",
|
||||
cmd = "Commentless",
|
||||
keys = {
|
||||
{
|
||||
"z/",
|
||||
function()
|
||||
require("commentless").toggle()
|
||||
end,
|
||||
desc = "Toggle Comments",
|
||||
},
|
||||
},
|
||||
dependencies = {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
},
|
||||
opts = {
|
||||
-- Customize Configuration
|
||||
},
|
||||
}}
|
||||
|
||||
7
.config/nvim/lua/plugins/hardtime.lua
Normal file
7
.config/nvim/lua/plugins/hardtime.lua
Normal file
@@ -0,0 +1,7 @@
|
||||
return {
|
||||
'm4xshen/hardtime.nvim',
|
||||
dependencies = { "MunifTanjim/nui.nvim" },
|
||||
opts = {
|
||||
},
|
||||
enabled = false
|
||||
}
|
||||
@@ -31,5 +31,5 @@ return {
|
||||
hijack_file_patterns = { "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp", "*.avif", "*.svg" }, -- render image files as images when opened
|
||||
})
|
||||
end,
|
||||
enabled = true
|
||||
enabled = false
|
||||
}
|
||||
|
||||
@@ -8,7 +8,6 @@ return {
|
||||
{ url = "http://git.sr.ht/~p00f/clangd_extensions.nvim" },
|
||||
},
|
||||
config = function()
|
||||
local nvim_lsp = require('lspconfig')
|
||||
require('clangd_extensions').setup({
|
||||
ast = {
|
||||
-- These are unicode, should be available in any font
|
||||
@@ -40,6 +39,7 @@ return {
|
||||
}
|
||||
}
|
||||
})
|
||||
vim.lsp.enable('clangd_extensions')
|
||||
--local lsp_signature = require('lsp_signature')
|
||||
|
||||
-- Mappings.
|
||||
@@ -107,9 +107,9 @@ return {
|
||||
virtual_text = false,
|
||||
update_in_insert = false,
|
||||
severity_sort = true,
|
||||
virtual_lines = {
|
||||
current_line = true,
|
||||
}
|
||||
-- virtual_lines = {
|
||||
-- current_line = true,
|
||||
-- }
|
||||
})
|
||||
end
|
||||
})
|
||||
@@ -123,16 +123,22 @@ return {
|
||||
-- )
|
||||
--capabilities.offsetEncoding = { "utf-16" }
|
||||
|
||||
nvim_lsp.groovyls.setup({
|
||||
vim.lsp.config('groovyls', {
|
||||
cmd = { "java", "-jar", "/home/kmcr/tools/groovy-language-server/build/libs/groovy-language-server-all.jar" },
|
||||
capabilities = capabilities
|
||||
})
|
||||
|
||||
nvim_lsp.clangd.setup({
|
||||
vim.lsp.config('clangd_extensions', {
|
||||
cmd = {
|
||||
"/workspace/WayveCode/bzl-build/WayveCode/external/llvm_toolchain_llvm/bin/clangd",
|
||||
"--background-index",
|
||||
"-j=32",
|
||||
"--header-insertion=never"},
|
||||
capabilities = capabilities,
|
||||
filetypes = { "cpp" },
|
||||
})
|
||||
|
||||
nvim_lsp.pylsp.setup({
|
||||
vim.lsp.config('pylsp', {
|
||||
settings = {
|
||||
pylint = {
|
||||
enabled = true
|
||||
@@ -144,7 +150,7 @@ return {
|
||||
capabilities = capabilities
|
||||
})
|
||||
|
||||
nvim_lsp.lua_ls.setup({
|
||||
vim.lsp.config('lua_ls', {
|
||||
settings = {
|
||||
Lua = {
|
||||
diagnostics = { globals = { "vim" } },
|
||||
@@ -164,27 +170,27 @@ return {
|
||||
-- single_file_support = true,
|
||||
-- settings = {
|
||||
-- matlab = {
|
||||
-- indexWorkspace = false,
|
||||
-- -- indexWorkspace = false,
|
||||
-- installPath = "/usr/local/MATLAB/R2024b",
|
||||
-- matlabConnectionTiming = "onStart",
|
||||
-- telemetry = true,
|
||||
-- -- matlabConnectionTiming = "onStart",
|
||||
-- -- telemetry = true,
|
||||
-- },
|
||||
-- }
|
||||
-- })
|
||||
--
|
||||
nvim_lsp.typos_lsp.setup({
|
||||
|
||||
vim.lsp.config('typos_lsp', {
|
||||
cmd = { 'typos-lsp' },
|
||||
filetypes = { '*' },
|
||||
root_dir = nvim_lsp.util.root_pattern('typos.toml', '_typos.toml', '.typos.toml'),
|
||||
root_dir = require("lspconfig.util").root_pattern('typos.toml', '_typos.toml', '.typos.toml'),
|
||||
single_file_support = true,
|
||||
settings = {},
|
||||
})
|
||||
|
||||
-- Use a loop to conveniently call 'setup' on multiple servers and
|
||||
-- map buffer local keybindings when the language server attaches
|
||||
local servers = { "cmake", "rust_analyzer", "bashls", "marksman" }
|
||||
local servers = { "cmake", "rust_analyzer", "bashls", "marksman", "bzl" }
|
||||
for _, lsp in ipairs(servers) do
|
||||
nvim_lsp[lsp].setup({
|
||||
vim.lsp.config(lsp, {
|
||||
capabilities = capabilities,
|
||||
})
|
||||
end
|
||||
|
||||
@@ -57,6 +57,7 @@ return { {
|
||||
completions = { blink = { enabled = true } },
|
||||
render_modes = { 'n', 'c', 't' },
|
||||
},
|
||||
enabled = false
|
||||
},
|
||||
{
|
||||
'Thiago4532/mdmath.nvim',
|
||||
|
||||
@@ -8,4 +8,8 @@ return {{
|
||||
}, {
|
||||
'mong8se/buffish.nvim',
|
||||
vim.keymap.set("n", "<leader>tb", function() require('buffish').open() end, { desc = "Open buffers list" })
|
||||
}, {
|
||||
"benomahony/oil-git.nvim",
|
||||
dependencies = { "stevearc/oil.nvim" },
|
||||
enabled = false
|
||||
}}
|
||||
|
||||
@@ -3,4 +3,5 @@ return {
|
||||
config = function()
|
||||
require("pendulum").setup()
|
||||
end,
|
||||
enabled = false
|
||||
}
|
||||
|
||||
@@ -6,11 +6,12 @@ return {
|
||||
'nvim-telescope/telescope-symbols.nvim',
|
||||
'mrloop/telescope-git-branch.nvim',
|
||||
{
|
||||
"isak102/telescope-git-file-history.nvim",
|
||||
dependencies = { "tpope/vim-fugitive" }
|
||||
'isak102/telescope-git-file-history.nvim',
|
||||
dependencies = { 'tpope/vim-fugitive' }
|
||||
},
|
||||
'kiyoon/telescope-insert-path.nvim',
|
||||
"zongben/navimark.nvim",
|
||||
'zongben/navimark.nvim',
|
||||
'johmsalas/text-case.nvim',
|
||||
},
|
||||
event = 'VeryLazy',
|
||||
--cmd = ":Telescope",
|
||||
@@ -56,6 +57,17 @@ return {
|
||||
},
|
||||
}
|
||||
}
|
||||
require('textcase').setup({
|
||||
enabled_methods = {
|
||||
"to_lower_case",
|
||||
"to_snake_case",
|
||||
"to_dash_case",
|
||||
"to_constant_case",
|
||||
"to_camel_case",
|
||||
"to_title_case",
|
||||
"to_path_case",
|
||||
}
|
||||
})
|
||||
require('telescope').load_extension('undo')
|
||||
require('telescope').load_extension('menufacture')
|
||||
require("telescope").load_extension("git_file_history")
|
||||
@@ -75,6 +87,8 @@ return {
|
||||
-- Neovim lsp pickers
|
||||
map('n', 'grr', function() require("telescope.builtin").lsp_references() end, def)
|
||||
map('n', 'gd', function() require("telescope.builtin").lsp_definitions() end, def)
|
||||
map('n', 'grt', "<cmd>TextCaseOpenTelescope<CR>", def)
|
||||
map('x', 'grt', "<cmd>TextCaseOpenTelescope<CR>", def)
|
||||
-- git pickers
|
||||
-- map('n', '<leader>gc', function() require("telescope.builtin").git_commits() end, def)
|
||||
-- map('n', '<leader>gC', function() require("telescope.builtin").git_bcommits() end, def)
|
||||
|
||||
@@ -41,7 +41,7 @@ return {
|
||||
"ini",
|
||||
"jq",
|
||||
"json",
|
||||
"latex",
|
||||
--"latex",
|
||||
"lua",
|
||||
"make",
|
||||
"markdown",
|
||||
|
||||
5
.config/nvim/lua/plugins/yadm.lua
Normal file
5
.config/nvim/lua/plugins/yadm.lua
Normal file
@@ -0,0 +1,5 @@
|
||||
return {
|
||||
"Kohei-Wada/yadm-git.nvim",
|
||||
lazy = true,
|
||||
event = "VeryLazy",
|
||||
}
|
||||
12
.gitattributes
vendored
12
.gitattributes
vendored
@@ -1,6 +1,6 @@
|
||||
*.bmp diff=image
|
||||
*.gif diff=image
|
||||
*.jpeg diff=image
|
||||
*.jpg diff=image
|
||||
*.png diff=image
|
||||
*.svg diff=image
|
||||
#*.bmp diff=image
|
||||
#*.gif diff=image
|
||||
#*.jpeg diff=image
|
||||
#*.jpg diff=image
|
||||
#*.png diff=image
|
||||
#*.svg diff=image
|
||||
|
||||
120
.gitconfig
120
.gitconfig
@@ -1,44 +1,59 @@
|
||||
[push]
|
||||
default = simple
|
||||
[user]
|
||||
name = Robert Kmieć
|
||||
email = KmcR@viessmann.com
|
||||
email = robert.r.kmiec@gmail.com
|
||||
[core]
|
||||
editor = nvim
|
||||
pager = delta
|
||||
autocrlf = false
|
||||
excludesfile = /home/rkmiec/.config/git/ignore
|
||||
excludesfile = ~/.config/git/ignore
|
||||
symlinks = true
|
||||
attributesfile = ~/.gitattributes
|
||||
fsmonitor = true
|
||||
#attributesfile = ~/.gitattributes
|
||||
untrackedCache = true
|
||||
[init]
|
||||
defaultBranch = master
|
||||
[advice]
|
||||
detachedHead = false
|
||||
[help]
|
||||
autocorrect = 1
|
||||
[color]
|
||||
ui = true
|
||||
[column]
|
||||
ui = auto
|
||||
[grep]
|
||||
linenumber = true
|
||||
[sendemail]
|
||||
smtpencryption = tls
|
||||
smtpserver = smtp.gmail.com
|
||||
smtpuser = robert.r.kmiec@gmail.com
|
||||
smtpserverport = 587
|
||||
[merge]
|
||||
conflictstyle = diff3
|
||||
tool = nfugitive
|
||||
[mergetool "nfugitive"]
|
||||
cmd = nvim -c "Gvdiffsplit!" "$MERGED"
|
||||
[diff]
|
||||
tool = nvimdiff
|
||||
[difftool "nvimdiff"]
|
||||
cmd = nvim -d "$LOCAL" "$REMOTE"
|
||||
[diff "markdown"]
|
||||
xfuncname = "^#+.*$"
|
||||
parrernType = perl
|
||||
[fetch]
|
||||
writeCommitGraph = true
|
||||
all = true
|
||||
#pruneTags = true
|
||||
[push]
|
||||
default = simple
|
||||
autoSetupRemote = true
|
||||
[filter "lfs"]
|
||||
clean = git-lfs clean -- %f
|
||||
smudge = git-lfs smudge -- %f
|
||||
process = git-lfs filter-process
|
||||
required = true
|
||||
[pull]
|
||||
rebase = true
|
||||
[rebase]
|
||||
autosquash = true
|
||||
autostash = true
|
||||
updateRefs = true
|
||||
[commit]
|
||||
template = .gitmessage
|
||||
verbose = false
|
||||
[submodule]
|
||||
recurse = false
|
||||
fetchJobs = 4
|
||||
[rerere]
|
||||
enabled = true
|
||||
autoupdate = true
|
||||
[branch]
|
||||
sort = committerdate
|
||||
[tag]
|
||||
sort = version:refname
|
||||
[alias]
|
||||
cm = commit
|
||||
co = checkout
|
||||
@@ -51,9 +66,38 @@
|
||||
diff-image = "!f() { cd -- \"${GIT_PREFIX:-.}\"; GIT_DIFF_IMAGE_ENABLED=1 git diff \"$@\"; }; f"
|
||||
[interactive]
|
||||
diffFilter = delta --color-only
|
||||
[merge]
|
||||
conflictstyle = zdiff3
|
||||
tool = nfugitive
|
||||
[mergetool "nfugitive"]
|
||||
cmd = nvim -c "Gvdiffsplit!" "$MERGED"
|
||||
[diff]
|
||||
tool = nvimdiff
|
||||
colorMoved = plain
|
||||
algorithm = histogram
|
||||
renames = true
|
||||
mnemonicPrefix = true
|
||||
[difftool "nvimdiff"]
|
||||
cmd = nvim -d "$LOCAL" "$REMOTE"
|
||||
[diff "image"]
|
||||
command = /home/kmcr/tools/git-diff-image/git_diff_image
|
||||
textconv = imgcat
|
||||
[diff "model"]
|
||||
command = /home/kmcr/tools/git-diff-image/git_diff_image
|
||||
textconv = imgcat
|
||||
[diff "markdown"]
|
||||
xfuncname = "^#+.*$"
|
||||
[delta]
|
||||
features = side-by-side line-numbers decorations
|
||||
whitespace-error-style = 22 reverse
|
||||
navigate = true
|
||||
; dark = true
|
||||
; side-by-side = true
|
||||
; line-numbers = true
|
||||
; hyperlinks = true
|
||||
; # colorMoved support
|
||||
; map-styles = bold purple => syntax magenta, bold cyan => syntax blue
|
||||
; true-color = always
|
||||
[delta "decorations"]
|
||||
commit-decoration-style = bold yellow box ul
|
||||
file-style = bold yellow ul
|
||||
@@ -63,16 +107,8 @@
|
||||
[commit]
|
||||
template = .gitmessage
|
||||
verbose = false
|
||||
[mergetool "vimdiff"]
|
||||
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
|
||||
[init]
|
||||
defaultBranch = master
|
||||
[diff "image"]
|
||||
command = /home/kmcr/tools/git-diff-image/git_diff_image
|
||||
textconv = imgcat
|
||||
[diff "model"]
|
||||
command = /home/kmcr/tools/git-diff-image/git_diff_image
|
||||
textconv = imgcat
|
||||
[advice]
|
||||
detachedHead = false
|
||||
[submodule]
|
||||
@@ -83,7 +119,29 @@
|
||||
ui = auto
|
||||
[branch]
|
||||
sort = -commiterdate
|
||||
[fetch]
|
||||
writeCommitGraph = true
|
||||
[pull]
|
||||
rebase = true
|
||||
[commit]
|
||||
#template = .gitmessage
|
||||
verbose = false
|
||||
[init]
|
||||
defaultBranch = master
|
||||
[advice]
|
||||
detachedHead = false
|
||||
[submodule]
|
||||
recurse = false
|
||||
[rerere]
|
||||
enabled = true
|
||||
[column]
|
||||
ui = auto
|
||||
[branch]
|
||||
sort = -commiterdate
|
||||
[maintenance]
|
||||
repo = /home/kmcr/repos/hems/hemsmilsimulation
|
||||
[sendemail]
|
||||
smtpencryption = tls
|
||||
smtpserver = smtp.gmail.com
|
||||
smtpuser = robert.r.kmiec@gmail.com
|
||||
smtpserverport = 587
|
||||
[feature]
|
||||
experimental = true
|
||||
|
||||
Reference in New Issue
Block a user