From c4125a4626d7ec492276a1ea3ff26dc86810534a Mon Sep 17 00:00:00 2001 From: js0ny Date: Sat, 1 Feb 2025 02:38:05 +0000 Subject: [PATCH] Minor fix on Linux --- .gitignore | 2 + platforms/linux/chromium-flags.conf | 6 ++- platforms/linux/etc/environment | 10 ++--- platforms/linux/etc/keyd/default.conf | 14 +++++++ tools/fish/conf.d/alias.fish | 2 +- tools/nvim/lazy-lock.json | 55 --------------------------- tools/zed/keymap.json | 12 ++++++ tools/zed/settings.json | 3 +- 8 files changed, 41 insertions(+), 63 deletions(-) create mode 100644 platforms/linux/etc/keyd/default.conf delete mode 100644 tools/nvim/lazy-lock.json diff --git a/.gitignore b/.gitignore index cbaaf90..51abb34 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ common/fzfrc gitconfig spacemacs/ + +lazy-lock.json diff --git a/platforms/linux/chromium-flags.conf b/platforms/linux/chromium-flags.conf index db0dfca..091ec71 100644 --- a/platforms/linux/chromium-flags.conf +++ b/platforms/linux/chromium-flags.conf @@ -5,9 +5,13 @@ # This solves the issue of chromium apps not being able to access passwords in non-plasma environments # Location: -# ~/.config/chromium-flags.conf +# ~/.config/chromium-flags.conf (for chromium) +# ~/.config/chrome-flags.conf # ~/.var/app/com.vivaldi.Vivaldi/config/vivaldi-flags.conf (For flatpak) +# ~/.config/vivaldi-stable.conf (For ArchLinux vivaldi) # Linking: # ln -sf $DOTFILES/platforms/linux/chromium-flags.conf ~/.var/app/com.vivaldi.Vivaldi/config/vivaldi-flags.conf +--UseOzonePlatform=wayland +--ozone-platform=wayland --password-store=kwallet6 --enable-wayland-ime diff --git a/platforms/linux/etc/environment b/platforms/linux/etc/environment index dcb8961..2649112 100644 --- a/platforms/linux/etc/environment +++ b/platforms/linux/etc/environment @@ -23,8 +23,8 @@ QT_IM_MODULE=fcitx SDL_IM_MODULE=fcitx XMODIFIFERS="@im=fcitx" GLFW_IM_MODULE=fcitx -# Scaling -QT_SCALE_FACTOR=1.75 -# 2 * 0.875 = 1.75 -GDK_SCALE=2 -GDK_DPI_SCALE=0.875 +# Scaling - Buggy on Plasma +# QT_SCALE_FACTOR=1.75 +# # 2 * 0.875 = 1.75 +# GDK_SCALE=2 +# GDK_DPI_SCALE=0.875 diff --git a/platforms/linux/etc/keyd/default.conf b/platforms/linux/etc/keyd/default.conf new file mode 100644 index 0000000..1c5022d --- /dev/null +++ b/platforms/linux/etc/keyd/default.conf @@ -0,0 +1,14 @@ +# /etc/keyd/default.conf + +[ids] + +* + +[main] + +# Maps capslock to escape when pressed and control when held. +capslock= overload(control, esc) +enter= overload(control, enter) +backspace= \ +\= backspace +tab=overload(alt, tab) diff --git a/tools/fish/conf.d/alias.fish b/tools/fish/conf.d/alias.fish index 7971b2e..8c35a72 100644 --- a/tools/fish/conf.d/alias.fish +++ b/tools/fish/conf.d/alias.fish @@ -64,7 +64,7 @@ if command -v pacman > /dev/null abbr --add pacu "sudo pacman -Syu" if command -v paru > /dev/null abbr --add pacs "paru -Ss" - elif command -v yay > /dev/null + else if command -v yay > /dev/null abbr --add pacs "yay -Ss" else abbr --add pacs "pacman -Ss" diff --git a/tools/nvim/lazy-lock.json b/tools/nvim/lazy-lock.json deleted file mode 100644 index cc24f68..0000000 --- a/tools/nvim/lazy-lock.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, - "alpha-nvim": { "branch": "main", "commit": "de72250e054e5e691b9736ee30db72c65d560771" }, - "auto-session": { "branch": "main", "commit": "16016db7f79d942a1538eaafb15a39f033f7a359" }, - "betterTerm.nvim": { "branch": "main", "commit": "5d3f41d9e8b3553d49764906a14e45a08dbe2308" }, - "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, - "catppuccin": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "code_runner.nvim": { "branch": "main", "commit": "65218f8f646fe61e506090522df357539642ae83" }, - "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" }, - "copilot.vim": { "branch": "release", "commit": "87038123804796ca7af20d1b71c3428d858a9124" }, - "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, - "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "gitsigns.nvim": { "branch": "main", "commit": "d8918f06624dd53b9a82bd0e29c31bcfd541b40d" }, - "grug-far.nvim": { "branch": "main", "commit": "82a81e0b5638667893d0d89f232dbb510cc5ab14" }, - "hover.nvim": { "branch": "main", "commit": "140c4d0ae9397b76baa46b87c574f5377de09309" }, - "kanagawa.nvim": { "branch": "master", "commit": "988082eb00b845e4afbcaa4fd8e903da8a3ab3b9" }, - "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, - "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" }, - "lazygit.nvim": { "branch": "main", "commit": "77a0d42943d8265271e6e6beaed72da54eeb17e7" }, - "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, - "luasnip-latex-snippets.nvim": { "branch": "main", "commit": "cab134611eb755abe9ba95f5d86969f5cece448d" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" }, - "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, - "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, - "nvim-lspconfig": { "branch": "master", "commit": "1f941b3668151963fca3e1230922c433ea4b7b64" }, - "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" }, - "nvim-tree.lua": { "branch": "master", "commit": "d529a99f88e0dff02e0aa275db2f595cd252a2c8" }, - "nvim-treesitter": { "branch": "master", "commit": "2206739829518c9ea59dbdb9003e0147fdaf2d1c" }, - "nvim-treesitter-context": { "branch": "master", "commit": "bece284c5322ddf6946fa4bdc383a2bc033269d7" }, - "nvim-web-devicons": { "branch": "master", "commit": "1c9136332840edee0c593f2f4f89598c8ed97f5f" }, - "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, - "onedarkpro.nvim": { "branch": "main", "commit": "44775f8206ee43b692e7f3dc894ddc47996ee523" }, - "orgmode": { "branch": "master", "commit": "ac7821620462b69c32f237736996e67ab291058b" }, - "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, - "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "render-markdown.nvim": { "branch": "main", "commit": "ad055861d17afe058bd835e82292e14a64b51b1d" }, - "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" }, - "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "trouble.nvim": { "branch": "main", "commit": "50481f414bd3c1a40122c1d759d7e424d5fafe84" }, - "vim-floaterm": { "branch": "master", "commit": "4e28c8dd0271e10a5f55142fb6fe9b1599ee6160" }, - "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, - "vim-just": { "branch": "main", "commit": "0f7d26de0c48e2620b733e51f4159aae13dc3bee" }, - "vim-visual-multi-colemak-hnei": { "branch": "master", "commit": "2cc37d77590d6569d991ebd8d96ab5867eb5a47a" }, - "vim-wakatime": { "branch": "master", "commit": "e46d7c4f98ee0f40782008dd60cb2a79c377fb1d" }, - "vimtex": { "branch": "master", "commit": "83e331dcad5ce28012e656eea3906b5b897db2ba" }, - "which-key.nvim": { "branch": "main", "commit": "6cebd86917df559a88de0f806b2989799c6e6423" }, - "winbar.nvim": { "branch": "main", "commit": "13739fdb31be51a1000486189662596f07a59a31" }, - "yanky.nvim": { "branch": "main", "commit": "d2696b30e389dced94d5acab728f524a25f308d2" } -} diff --git a/tools/zed/keymap.json b/tools/zed/keymap.json index d3a9cd5..04c092d 100755 --- a/tools/zed/keymap.json +++ b/tools/zed/keymap.json @@ -58,5 +58,17 @@ "k": "search::SelectNextMatch", "K": "search::SelectPrevMatch" } + }, + { + "context": "ProjectPanel && not_editing", + + "bindings": { + "n": "menu::SelectNext", + "e": "menu::SelectPrev", + "i": "project_panel::ExpandSelectedEntry", + "A": "project_panel::NewDirectory", + "a": "project_panel::NewFile", + "d": "project_panel::Delete" + } } ] diff --git a/tools/zed/settings.json b/tools/zed/settings.json index 24fa39f..3ada2ab 100644 --- a/tools/zed/settings.json +++ b/tools/zed/settings.json @@ -18,9 +18,10 @@ // custom settings, run `zed: open default settings` from the // command palette (cmd-shift-p / ctrl-shift-p) { + "base_keymap": "VSCode", "vim_mode": true, "ui_font_size": 16, - "buffer_font_size": 16, + "buffer_font_size": null, "theme": { "mode": "dark", "light": "Catppuccin Latte",