Compare commits
3 Commits
745ab5c492
...
7b642b5868
| Author | SHA1 | Date | |
|---|---|---|---|
| 7b642b5868 | |||
| f8983f838d | |||
| cd577f9e62 |
@@ -34,7 +34,7 @@ M.globalkeys = gears.table.join(
|
|||||||
awful.key({ modkey, "Control" }, "p", function() awful.spawn("xfce4-screenshooter") end, { description = "screenshot", group = "system" }),
|
awful.key({ modkey, "Control" }, "p", function() awful.spawn("xfce4-screenshooter") end, { description = "screenshot", group = "system" }),
|
||||||
|
|
||||||
-- Alt tab current workspace windows
|
-- Alt tab current workspace windows
|
||||||
awful.key({ "Mod1" }, "Tab", function() awful.client.focus.byidx(1) end),
|
awful.key({ modkey }, "Tab", function() awful.client.focus.byidx(1) end),
|
||||||
|
|
||||||
-- Media keys
|
-- Media keys
|
||||||
awful.key({ }, "XF86AudioRaiseVolume", function() awful.spawn.easy_async_with_shell([[sh -c 'pactl set-sink-volume "$(pactl get-default-sink)" +2%']]) end, { description = "volume up", group = "media" }),
|
awful.key({ }, "XF86AudioRaiseVolume", function() awful.spawn.easy_async_with_shell([[sh -c 'pactl set-sink-volume "$(pactl get-default-sink)" +2%']]) end, { description = "volume up", group = "media" }),
|
||||||
|
|||||||
@@ -3,18 +3,35 @@ local beautiful = require("beautiful")
|
|||||||
local keys = require("config.keys")
|
local keys = require("config.keys")
|
||||||
|
|
||||||
return {
|
return {
|
||||||
{ rule = { }, properties = {
|
{
|
||||||
|
rule = { },
|
||||||
|
properties = {
|
||||||
border_width = beautiful.border_width, border_color = beautiful.border_normal,
|
border_width = beautiful.border_width, border_color = beautiful.border_normal,
|
||||||
focus = awful.client.focus.filter, raise = true,
|
focus = awful.client.focus.filter, raise = true,
|
||||||
keys = keys.clientkeys, buttons = keys.clientbuttons,
|
keys = keys.clientkeys, buttons = keys.clientbuttons,
|
||||||
screen = awful.screen.preferred,
|
screen = awful.screen.preferred,
|
||||||
placement = awful.placement.no_overlap + awful.placement.no_offscreen,
|
placement = awful.placement.no_overlap + awful.placement.no_offscreen,
|
||||||
}},
|
}
|
||||||
|
},
|
||||||
{ rule_any = {
|
{
|
||||||
|
rule_any = {
|
||||||
instance = { "pinentry" },
|
instance = { "pinentry" },
|
||||||
class = { "Arandr", "Blueman-manager", "Gpick", "Pavucontrol" },
|
class = { "Arandr", "Blueman-manager", "Gpick", "Pavucontrol" },
|
||||||
name = { "Event Tester" },
|
name = { "Event Tester" },
|
||||||
role = { "AlarmWindow", "pop-up" },
|
role = { "AlarmWindow", "pop-up" },
|
||||||
}, properties = { floating = true }},
|
},
|
||||||
|
properties = { floating = true }
|
||||||
|
},
|
||||||
|
{
|
||||||
|
rule = { name = "Sublime Terminal", },
|
||||||
|
properties = { floating = false, },
|
||||||
|
callback = function(c)
|
||||||
|
awful.client.setslave(c)
|
||||||
|
|
||||||
|
local t = c.first_tag
|
||||||
|
if t then
|
||||||
|
t.master_width_factor = 0.67
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ naughty.config.defaults.font = "JetBrainsMono Nerd Font 12"
|
|||||||
naughty.config.defaults.shape = function(cr, w, h) gears.shape.rounded_rect(cr, w, h, 13) end
|
naughty.config.defaults.shape = function(cr, w, h) gears.shape.rounded_rect(cr, w, h, 13) end
|
||||||
|
|
||||||
naughty.config.presets.normal = {
|
naughty.config.presets.normal = {
|
||||||
bg = colors.background, fg = colors.foreground, border_color = colors.background_alt,
|
bg = colors.background, fg = colors.foreground, border_color = colors.accent,
|
||||||
border_width = 3, font = "JetBrainsMono Nerd Font 12", timeout = 5,
|
border_width = 3, font = "JetBrainsMono Nerd Font 12", timeout = 5,
|
||||||
}
|
}
|
||||||
naughty.config.presets.low = naughty.config.presets.normal
|
naughty.config.presets.low = naughty.config.presets.normal
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ local naughty = require("naughty")
|
|||||||
local bling = require("bling")
|
local bling = require("bling")
|
||||||
|
|
||||||
-- Global config
|
-- Global config
|
||||||
modkey = "Mod1" -- Alt. Use "Mod4" for the Super/Windows key.
|
modkey = "Mod4" -- Alt. Use "Mod4" for the Super/Windows key.
|
||||||
terminal = "alacritty"
|
terminal = "alacritty"
|
||||||
editor = os.getenv("EDITOR") or "nano"
|
editor = os.getenv("EDITOR") or "nano"
|
||||||
|
|
||||||
|
|||||||
+13
-4
@@ -10,13 +10,22 @@ vim.o.scrolloff = 20
|
|||||||
vim.o.shiftwidth = 4
|
vim.o.shiftwidth = 4
|
||||||
vim.o.tabstop = 4
|
vim.o.tabstop = 4
|
||||||
vim.o.softtabstop = 4
|
vim.o.softtabstop = 4
|
||||||
|
vim.o.ignorecase = true
|
||||||
|
vim.o.smartcase = true
|
||||||
|
vim.o.incsearch = true
|
||||||
|
vim.o.hlsearch = true
|
||||||
|
vim.o.mouse = "a"
|
||||||
vim.o.path = "**"
|
vim.o.path = "**"
|
||||||
vim.o.clipboard = "unnamedplus"
|
vim.o.clipboard = "unnamedplus"
|
||||||
|
vim.o.foldenable = true
|
||||||
vim.o.foldmethod = "expr"
|
vim.o.foldmethod = "expr"
|
||||||
vim.o.foldlevel = 99
|
vim.o.foldlevel = 99
|
||||||
vim.o.completeopt = "menuone,noselect,fuzzy,nosort"
|
vim.o.splitright = true
|
||||||
|
vim.o.splitbelow = true
|
||||||
|
vim.o.signcolumn = "yes"
|
||||||
|
vim.o.completeopt = "menu,menuone,noselect,popup,fuzzy"
|
||||||
vim.o.undofile = true
|
vim.o.undofile = true
|
||||||
vim.o.undodir = os.getenv("HOME") .. "/.cache/nvim/undodir"
|
vim.o.undodir = vim.fn.stdpath("state") .. "/undo"
|
||||||
vim.o.errorformat = "%f(%l:%c) %m,%-G%.%#"
|
vim.o.errorformat = "%f(%l:%c) %m,%-G%.%#"
|
||||||
-- -----------------------------
|
-- -----------------------------
|
||||||
-- @BINDS
|
-- @BINDS
|
||||||
@@ -47,13 +56,13 @@ vim.pack.add({
|
|||||||
{ src = 'https://github.com/romus204/tree-sitter-manager.nvim' },
|
{ src = 'https://github.com/romus204/tree-sitter-manager.nvim' },
|
||||||
{ src = 'https://github.com/lukas-reineke/indent-blankline.nvim' },
|
{ src = 'https://github.com/lukas-reineke/indent-blankline.nvim' },
|
||||||
{ src = 'https://github.com/rebelot/kanagawa.nvim' },
|
{ src = 'https://github.com/rebelot/kanagawa.nvim' },
|
||||||
{ src = 'https://github.com/rose-pine/neovim' },
|
|
||||||
{ src = 'https://github.com/xiyaowong/transparent.nvim' },
|
{ src = 'https://github.com/xiyaowong/transparent.nvim' },
|
||||||
})
|
})
|
||||||
|
|
||||||
require("terminal")
|
require("terminal")
|
||||||
require("mini.completion").setup()
|
require("mini.completion").setup()
|
||||||
require('mini.statusline').setup({})
|
require('mini.statusline').setup()
|
||||||
|
require("mini.surround").setup()
|
||||||
require("tree-sitter-manager").setup()
|
require("tree-sitter-manager").setup()
|
||||||
require("ibl").setup({
|
require("ibl").setup({
|
||||||
indent = { char = "│" },
|
indent = { char = "│" },
|
||||||
|
|||||||
+65
-72
@@ -8,28 +8,12 @@
|
|||||||
"buffers":
|
"buffers":
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
"file": "config/nvim/init.lua",
|
"contents": "",
|
||||||
"settings":
|
"settings":
|
||||||
{
|
{
|
||||||
"buffer_size": 3461,
|
"buffer_size": 0,
|
||||||
"encoding": "UTF-8",
|
|
||||||
"line_ending": "Unix"
|
"line_ending": "Unix"
|
||||||
},
|
}
|
||||||
"undo_stack":
|
|
||||||
[
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"file": "scripts/installs/install_odin",
|
|
||||||
"settings":
|
|
||||||
{
|
|
||||||
"buffer_size": 703,
|
|
||||||
"encoding": "UTF-8",
|
|
||||||
"line_ending": "Unix"
|
|
||||||
},
|
|
||||||
"undo_stack":
|
|
||||||
[
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"build_system": "",
|
"build_system": "",
|
||||||
@@ -43,6 +27,30 @@
|
|||||||
"last_filter": "",
|
"last_filter": "",
|
||||||
"selected_items":
|
"selected_items":
|
||||||
[
|
[
|
||||||
|
[
|
||||||
|
"key",
|
||||||
|
"Preferences: Key Bindings"
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"toggle ",
|
||||||
|
"View: Toggle Tabs"
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"terminal set",
|
||||||
|
"Preferences: Terminal Settings"
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"install pacakge",
|
||||||
|
"Package Control: Install Package"
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"remove packa",
|
||||||
|
"Package Control: Remove Package"
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"termi",
|
||||||
|
"Terminus: Toggle Panel"
|
||||||
|
],
|
||||||
[
|
[
|
||||||
"colo",
|
"colo",
|
||||||
"UI: Select Color Scheme"
|
"UI: Select Color Scheme"
|
||||||
@@ -59,10 +67,6 @@
|
|||||||
"ke",
|
"ke",
|
||||||
"Preferences: Key Bindings"
|
"Preferences: Key Bindings"
|
||||||
],
|
],
|
||||||
[
|
|
||||||
"key",
|
|
||||||
"Preferences: Key Bindings"
|
|
||||||
],
|
|
||||||
[
|
[
|
||||||
"insta",
|
"insta",
|
||||||
"Package Control: Install Package"
|
"Package Control: Install Package"
|
||||||
@@ -175,12 +179,18 @@
|
|||||||
[
|
[
|
||||||
"/home/jason/.dotfiles",
|
"/home/jason/.dotfiles",
|
||||||
"/home/jason/.dotfiles/config",
|
"/home/jason/.dotfiles/config",
|
||||||
|
"/home/jason/.dotfiles/config/awesome",
|
||||||
|
"/home/jason/.dotfiles/config/awesome/config",
|
||||||
"/home/jason/.dotfiles/config/nvim"
|
"/home/jason/.dotfiles/config/nvim"
|
||||||
],
|
],
|
||||||
"file_history":
|
"file_history":
|
||||||
[
|
[
|
||||||
"/home/jason/.dotfiles/scripts/bin/bookmarks",
|
"/home/jason/.dotfiles/config/awesome/config/rules.lua",
|
||||||
|
"/home/jason/.dotfiles/config/awesome/config/theme.lua",
|
||||||
|
"/home/jason/.dotfiles/config/awesome/rc.lua",
|
||||||
"/home/jason/.dotfiles/config/nvim/init.lua",
|
"/home/jason/.dotfiles/config/nvim/init.lua",
|
||||||
|
"/home/jason/.dotfiles/scripts/installs/install_odin",
|
||||||
|
"/home/jason/.dotfiles/scripts/bin/bookmarks",
|
||||||
"/home/jason/.dotfiles/config/alacritty/alacritty.toml",
|
"/home/jason/.dotfiles/config/alacritty/alacritty.toml",
|
||||||
"/home/jason/.dotfiles/scripts/installs/install_php",
|
"/home/jason/.dotfiles/scripts/installs/install_php",
|
||||||
"/home/jason/.dotfiles/install.sh",
|
"/home/jason/.dotfiles/install.sh",
|
||||||
@@ -195,12 +205,11 @@
|
|||||||
"/home/jason/.config/sublime-text/Packages/Default/Default (Linux).sublime-keymap",
|
"/home/jason/.config/sublime-text/Packages/Default/Default (Linux).sublime-keymap",
|
||||||
"/home/jason/Projects/octal_cookie/src/machine/cpu.odin",
|
"/home/jason/Projects/octal_cookie/src/machine/cpu.odin",
|
||||||
"/home/jason/.dotfiles/config/nvim/nvim-pack-lock.json",
|
"/home/jason/.dotfiles/config/nvim/nvim-pack-lock.json",
|
||||||
"/home/jason/.dotfiles/config/awesome/rc.lua",
|
|
||||||
"/home/jason/.dotfiles/config/kanata/kanata.kbd"
|
"/home/jason/.dotfiles/config/kanata/kanata.kbd"
|
||||||
],
|
],
|
||||||
"find":
|
"find":
|
||||||
{
|
{
|
||||||
"height": 49.0
|
"height": 51.0
|
||||||
},
|
},
|
||||||
"find_in_files":
|
"find_in_files":
|
||||||
{
|
{
|
||||||
@@ -237,60 +246,25 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"buffer": 0,
|
"buffer": 0,
|
||||||
"file": "config/nvim/init.lua",
|
|
||||||
"semi_transient": false,
|
|
||||||
"settings":
|
|
||||||
{
|
|
||||||
"buffer_size": 3461,
|
|
||||||
"regions":
|
|
||||||
{
|
|
||||||
},
|
|
||||||
"selection":
|
|
||||||
[
|
|
||||||
[
|
|
||||||
36,
|
|
||||||
36
|
|
||||||
]
|
|
||||||
],
|
|
||||||
"settings":
|
|
||||||
{
|
|
||||||
"highlight_line": false,
|
|
||||||
"lsp_uri": "file:///home/jason/.dotfiles/config/nvim/init.lua",
|
|
||||||
"syntax": "Packages/Lua/Lua.sublime-syntax",
|
|
||||||
"tab_size": 4,
|
|
||||||
"translate_tabs_to_spaces": false
|
|
||||||
},
|
|
||||||
"translation.x": 0.0,
|
|
||||||
"translation.y": 0.0,
|
|
||||||
"zoom_level": 1.0
|
|
||||||
},
|
|
||||||
"stack_index": 1,
|
|
||||||
"stack_multiselect": false,
|
|
||||||
"type": "text"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"buffer": 1,
|
|
||||||
"file": "scripts/installs/install_odin",
|
|
||||||
"selected": true,
|
"selected": true,
|
||||||
"semi_transient": false,
|
"semi_transient": false,
|
||||||
"settings":
|
"settings":
|
||||||
{
|
{
|
||||||
"buffer_size": 703,
|
"buffer_size": 0,
|
||||||
"regions":
|
"regions":
|
||||||
{
|
{
|
||||||
},
|
},
|
||||||
"selection":
|
"selection":
|
||||||
[
|
[
|
||||||
[
|
[
|
||||||
459,
|
0,
|
||||||
459
|
0
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
"settings":
|
"settings":
|
||||||
{
|
{
|
||||||
"highlight_line": false,
|
"lsp_uri": "buffer:156",
|
||||||
"lsp_uri": "file:///home/jason/.dotfiles/scripts/installs/install_odin",
|
"syntax": "Packages/Text/Plain text.tmLanguage"
|
||||||
"syntax": "Packages/ShellScript/Bash.sublime-syntax"
|
|
||||||
},
|
},
|
||||||
"translation.x": 0.0,
|
"translation.x": 0.0,
|
||||||
"translation.y": 0.0,
|
"translation.y": 0.0,
|
||||||
@@ -305,11 +279,11 @@
|
|||||||
],
|
],
|
||||||
"incremental_find":
|
"incremental_find":
|
||||||
{
|
{
|
||||||
"height": 49.0
|
"height": 51.0
|
||||||
},
|
},
|
||||||
"input":
|
"input":
|
||||||
{
|
{
|
||||||
"height": 65.0
|
"height": 73.0
|
||||||
},
|
},
|
||||||
"layout":
|
"layout":
|
||||||
{
|
{
|
||||||
@@ -341,6 +315,13 @@
|
|||||||
[
|
[
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"output.buffers":
|
||||||
|
{
|
||||||
|
"height": 1116.0,
|
||||||
|
"history":
|
||||||
|
[
|
||||||
|
]
|
||||||
|
},
|
||||||
"output.diagnostics":
|
"output.diagnostics":
|
||||||
{
|
{
|
||||||
"height": 0.0,
|
"height": 0.0,
|
||||||
@@ -366,7 +347,7 @@
|
|||||||
"project": "dotfiles.sublime-project",
|
"project": "dotfiles.sublime-project",
|
||||||
"replace":
|
"replace":
|
||||||
{
|
{
|
||||||
"height": 94.0
|
"height": 98.0
|
||||||
},
|
},
|
||||||
"save_all_on_build": true,
|
"save_all_on_build": true,
|
||||||
"select_file":
|
"select_file":
|
||||||
@@ -375,6 +356,14 @@
|
|||||||
"last_filter": "",
|
"last_filter": "",
|
||||||
"selected_items":
|
"selected_items":
|
||||||
[
|
[
|
||||||
|
[
|
||||||
|
"awesomeconfig/",
|
||||||
|
"config/awesome/config/rules.lua"
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"awesome/",
|
||||||
|
"config/awesome/rc.lua"
|
||||||
|
],
|
||||||
[
|
[
|
||||||
"install_od",
|
"install_od",
|
||||||
"scripts/installs/install_odin"
|
"scripts/installs/install_odin"
|
||||||
@@ -404,6 +393,10 @@
|
|||||||
"",
|
"",
|
||||||
"~/Projects/octal_cookie/octal_cookie.sublime-project"
|
"~/Projects/octal_cookie/octal_cookie.sublime-project"
|
||||||
],
|
],
|
||||||
|
[
|
||||||
|
"gra",
|
||||||
|
"~/Projects/gravekeeper/gravekeeper.sublime-project"
|
||||||
|
],
|
||||||
[
|
[
|
||||||
"oc",
|
"oc",
|
||||||
"~/Projects/octal_cookie/octal_cookie.sublime-project"
|
"~/Projects/octal_cookie/octal_cookie.sublime-project"
|
||||||
@@ -432,9 +425,9 @@
|
|||||||
},
|
},
|
||||||
"show_minimap": false,
|
"show_minimap": false,
|
||||||
"show_open_files": false,
|
"show_open_files": false,
|
||||||
"show_tabs": true,
|
"show_tabs": false,
|
||||||
"side_bar_visible": false,
|
"side_bar_visible": true,
|
||||||
"side_bar_width": 306.0,
|
"side_bar_width": 481.0,
|
||||||
"status_bar_visible": true,
|
"status_bar_visible": true,
|
||||||
"template_settings":
|
"template_settings":
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user