From 1343b816849a3a2131086ce9964de7f246802995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Sun, 3 Sep 2023 14:12:00 +0200 Subject: [PATCH] Set timer for Xmodmap, change ctrl-o shortcut --- awesome/rc.lua | 17 +++++++++++------ clang/.clang-tidy | 3 ++- nvim/lua/teaching.lua | 1 + nvim/lua/telescope_config.lua | 12 +++++++++--- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/awesome/rc.lua b/awesome/rc.lua index 70ca91d..94eccd6 100644 --- a/awesome/rc.lua +++ b/awesome/rc.lua @@ -24,11 +24,8 @@ local run_on_start_up = { "numlockx on", "nm-applet", "xcape -e \"Super_L=Super_L|XF86Launch5\" -t 5000", - "xmodmap /home/user/.Xmodmap", - os.getenv("XDG_CONFIG_HOME") .. "/awesome/scripts/setup_display.sh", + gears.filesystem.get_configuration_dir() .. "/scripts/setup_display.sh", "feh --no-fehbg --bg-fill " .. gears.filesystem.get_configuration_dir() .. "/images/wallpaper.png", - -- "/opt/power/powersave.sh", - -- os.getenv("XDG_CONFIG_HOME") .. "/awesome/scripts/setup_display.sh" } -- Define layouts @@ -43,8 +40,6 @@ awful.layout.layouts = { grid, } - - -- Run all the apps listed in run_on_start_up for _, app in ipairs(run_on_start_up) do local findme = app @@ -56,6 +51,16 @@ for _, app in ipairs(run_on_start_up) do awful.spawn.with_shell(string.format("echo 'pgrep -u $USER -x %s > /dev/null || (%s)' | bash -", findme, app), false) end +-- Start timers +gears.timer { + timeout = 60, + call_now = true, + autostart = true, + callback = function() + awful.spawn.easy_async({"xmodmap", "/home/user/.Xmodmap"}) -- If not repeated it sometimes just stops working + end +} + -- Import Keybinds local keys = require("keys") root.keys(keys.globalkeys) diff --git a/clang/.clang-tidy b/clang/.clang-tidy index 6f9e73a..0299936 100644 --- a/clang/.clang-tidy +++ b/clang/.clang-tidy @@ -16,7 +16,8 @@ Checks: "*, -modernize-use-nodiscard -cppcoreguidelines-narrowing-conversions -cppcoreguidelines-avoid-magic-numbers - --Wsign-compare + -Wsign-compare + -hicpp-uppercase-literal-suffix -readability-uppercase-literal-suffix" WarningsAsErrors: '' HeaderFilterRegex: '' diff --git a/nvim/lua/teaching.lua b/nvim/lua/teaching.lua index 24f5360..135c716 100644 --- a/nvim/lua/teaching.lua +++ b/nvim/lua/teaching.lua @@ -11,6 +11,7 @@ local function should_load(path) [3] = "build", [4] = "third-party", [5] = "sfml", + [6] = "TinyXML" } local match = { [1] = ".hpp", diff --git a/nvim/lua/telescope_config.lua b/nvim/lua/telescope_config.lua index ab6863f..f48fb34 100644 --- a/nvim/lua/telescope_config.lua +++ b/nvim/lua/telescope_config.lua @@ -6,7 +6,7 @@ if not hastelescope then return M end -M.project_files = function() +M.git_files = function() local opts = require('telescope.themes').get_ivy({}) opts["show_untracked"] = true opts["layout_config"] = {height=0.2} @@ -15,6 +15,12 @@ M.project_files = function() end end +M.project_files = function() + local opts = require('telescope.themes').get_ivy({}) + opts["layout_config"] = {height=0.2} + require"telescope.builtin".find_files(opts) +end + M.buffers = function() local opts = require('telescope.themes').get_ivy({}) opts["layout_config"] = {height=0.2} @@ -66,8 +72,8 @@ telescope.load_extension('fzf') vim.keymap.set("n", "u", function() require("telescope").extensions.undo.undo() end, {noremap = true, silent = true}) -vim.keymap.set("n", "", function() require('telescope_config').project_files() end, {noremap = true, silent = true}) -vim.keymap.set("n", "", function() require('telescope_config').buffers() end, { silent = true, noremap = true }) +vim.keymap.set("n", "", function() require('telescope_config').git_files() end, {noremap = true, silent = true}) +vim.keymap.set("n", "", function() require('telescope_config').project_files() end, { silent = true, noremap = true }) vim.keymap.set("n", "", function() require('telescope.builtin').live_grep{ cwd = vim.fn.systemlist("git rev-parse --show-toplevel 2> /dev/null || pwd")[1] } end, { silent = true, noremap = true }) return M