diff --git a/.config/X11/Xresources b/.config/X11/Xresources index 4592b58..ee6905a 100644 --- a/.config/X11/Xresources +++ b/.config/X11/Xresources @@ -1,2 +1,7 @@ -# For laptop screen scale -Xft.dpi: 144 +Xft.dpi: 96 +Xft.autohint: 0 +Xft.lcdfilter: lcddefault +Xft.hintstyle: hintslight +Xft.hinting: 1 +Xft.antialias: 1 +Xft.rgba: rgb diff --git a/.config/nvim/lua/core/remaps.lua b/.config/nvim/lua/core/remaps.lua index 1145622..6410bb4 100644 --- a/.config/nvim/lua/core/remaps.lua +++ b/.config/nvim/lua/core/remaps.lua @@ -58,3 +58,7 @@ vim.keymap.set( ) vim.keymap.set("t", "", "", { silent = true }) + +vim.keymap.set("n", "e", function() vim.cmd("edit notes.ignore.md") end) +vim.keymap.set("n", ".a", function() vim.cmd("edit app/api/.env") end) +vim.keymap.set("n", ".f", function() vim.cmd("edit app/frontend/.env.development.local") end) diff --git a/.config/nvim/lua/plugins/linting.lua b/.config/nvim/lua/plugins/linting.lua index 7ad62e4..7d0c7b6 100644 --- a/.config/nvim/lua/plugins/linting.lua +++ b/.config/nvim/lua/plugins/linting.lua @@ -51,39 +51,6 @@ return { end, } - -- lint.linters.eslint_d = { - -- name = "eslint_d", - -- cmd = "eslint_d", - -- args = { - -- '--config=./frontend/.eslintrc.js', - -- '--no-warn-ignored', - -- '--format', - -- 'json', - -- '--stdin', - -- '--stdin-filename', - -- function() - -- return vim.api.nvim_buf_get_name(0) - -- end, - -- }, - -- parser = function(output, _) - -- local diagnostics = {} - -- local decoded = vim.json.decode(output) - -- for _, message in ipairs(decoded[1].messages or {}) do - -- table.insert(diagnostics, { - -- lnum = message.line - 1, - -- end_lnum = message.endLine and message.endLine - 1 or nil, - -- col = message.column - 1, - -- end_col = message.endColumn and message.endColumn - 1 or nil, - -- message = message.message, - -- code = message.ruleId, - -- source = "eslint_d", - -- severity = severities[message.severity], - -- }) - -- end - -- return diagnostics - -- end, - -- } - lint.linters_by_ft = { javascript = { "eslint" }, typescript = { "eslint" }, diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua index c240d35..67c4c4a 100644 --- a/.config/nvim/lua/plugins/lspconfig.lua +++ b/.config/nvim/lua/plugins/lspconfig.lua @@ -102,7 +102,7 @@ return { local global_ts = base_path .. "/typescript/lib" local found_ts = "" local function check_dir(path) - found_ts = table.concat({path, "node_modules", "typescript", "lib"}, "/") + found_ts = table.concat({path, "typescript", "lib"}, "/") if vim.loop.fs_stat(found_ts) then return path end diff --git a/.config/nvim/lua/plugins/neotest.lua b/.config/nvim/lua/plugins/neotest.lua index ccc0612..39e5ee3 100644 --- a/.config/nvim/lua/plugins/neotest.lua +++ b/.config/nvim/lua/plugins/neotest.lua @@ -58,8 +58,8 @@ return { adapters = { require("neotest-phpunit")({ root_files = { "phpunit.xml", "composer.json" }, - phpunit_cmd = { "docker", "compose", "exec", "fpm", "./vendor/bin/phpunit" }, - -- phpunit_cmd = { "docker", "compose", "exec", "app-fpm", "./vendor/bin/phpunit" }, + -- phpunit_cmd = { "docker", "compose", "exec", "fpm", "./vendor/bin/phpunit" }, + phpunit_cmd = { "docker", "compose", "exec", "app-fpm", "./vendor/bin/phpunit" }, filter_dirs = { "vendor" }, mapped_docker_dir = "/var/www", append_to_cwd = "/api", diff --git a/.local/bin/dwm-autostart b/.local/bin/dwm-autostart index 470ea12..253864b 100755 --- a/.local/bin/dwm-autostart +++ b/.local/bin/dwm-autostart @@ -8,3 +8,5 @@ xsetroot -solid "#1A1A22" # nohup /usr/lib/kdeconnectd >/dev/null 2>&1 & nohup dwmblocks & + +~/.screenlayout/office.sh diff --git a/.local/bin/scale-external-display.sh b/.local/bin/scale-external-display.sh index bf3b319..0c71e19 100755 --- a/.local/bin/scale-external-display.sh +++ b/.local/bin/scale-external-display.sh @@ -1,3 +1,3 @@ #!/bin/bash -xrandr --output DP-3-1 --scale 1.5x1.5 +xrandr --output HDMI-1 --scale 1.5x1.5