From 3d12a52b4740d367c7ec9ef328b551c1701bf6c0 Mon Sep 17 00:00:00 2001 From: js0ny Date: Mon, 13 Oct 2025 19:30:59 +0100 Subject: [PATCH] Update home/.chezmoiignore Update home/.config/nvim/lsp/luals.lua Update home/.config/nvim/lua/plugins/lang/markdown/obsidian-nvim.lua Update home/.config/nvim/lua/plugins/mod/snacks-nvim.lua Add home/.config/nvim/luarc.jsonc Update home/.config/zed/keymap.json Update nixcfgs/users/js0ny/packages/cli.nix Update nixcfgs/users/js0ny/packages/gui.nix Update nixcfgs/users/js0ny/programs/gnome.nix --- home/.chezmoiignore.tmpl | 3 +- home/dot_config/nvim/lsp/luals.lua | 52 ++++++++++++++++++- .../plugins/lang/markdown/obsidian-nvim.lua | 19 ++++--- .../nvim/lua/plugins/mod/snacks-nvim.lua | 2 +- home/dot_config/nvim/luarc.jsonc | 20 +++++++ home/dot_config/zed/keymap.json | 3 ++ nixcfgs/users/js0ny/packages/cli.nix | 1 + nixcfgs/users/js0ny/packages/gui.nix | 5 +- nixcfgs/users/js0ny/programs/gnome.nix | 26 +++++++++- 9 files changed, 116 insertions(+), 15 deletions(-) create mode 100644 home/dot_config/nvim/luarc.jsonc diff --git a/home/.chezmoiignore.tmpl b/home/.chezmoiignore.tmpl index 557c772..130d0b3 100644 --- a/home/.chezmoiignore.tmpl +++ b/home/.chezmoiignore.tmpl @@ -35,6 +35,7 @@ scripts .config/keyd .config/readline .chezmoiscripts/* +.bashrc {{ end }} {{ end }} @@ -45,4 +46,4 @@ Library .config/skhd .config/yabai .config/powershell -{{ end}} +{{ end }} diff --git a/home/dot_config/nvim/lsp/luals.lua b/home/dot_config/nvim/lsp/luals.lua index f59f77a..6decef3 100644 --- a/home/dot_config/nvim/lsp/luals.lua +++ b/home/dot_config/nvim/lsp/luals.lua @@ -16,6 +16,7 @@ exec "$HOME/.local/build/lua-language-server/bin/lua-language-server" "$@" --]] return { cmd = { "lua-language-server" }, + filetypes = { "lua" }, root_markers = { ".luarc.json", ".luarc.jsonc", @@ -24,14 +25,63 @@ return { "stylua.toml", "selene.toml", "selene.yml", + ".git", }, - filetypes = { "lua" }, + on_init = function(client) + local path = client.workspace_folders and client.workspace_folders[1] and client.workspace_folders[1].name + if path and (vim.uv.fs_stat(path .. "/.luarc.json") or vim.uv.fs_stat(path .. "/.luarc.jsonc")) then + return + end + client.config.settings = vim.tbl_deep_extend("force", client.config.settings, { + Lua = { + runtime = { + version = "LuaJIT", + }, + workspace = { + checkThirdParty = false, + library = { + vim.env.VIMRUNTIME, + "${3rd}/luv/library", + }, + }, + }, + }) + end, settings = { Lua = { + -- Inlay hints hint = { enable = true, setType = true, + arrayIndex = "Disable", }, + codeLens = { + enable = true, + }, + completion = { + callSnippet = "Replace", + postfix = ".", + displayContext = 50, + }, + telemetry = { + enable = false, + }, + -- Lua LS offers a code formatter + -- Ref: https://github.com/LuaLS/lua-language-server/wiki/Formatter + -- format = { + -- enable = true, + -- defaultConfig = { + -- indent_size = "4", + -- max_line_length = "100", + -- continuation_indent = "8", + -- }, + -- }, + -- diagnostics = { + -- -- Code style checking offered by the Lua LS code formatter + -- neededFileStatus = { + -- ["codestyle-check"] = "Any", + -- }, + -- }, }, }, } diff --git a/home/dot_config/nvim/lua/plugins/lang/markdown/obsidian-nvim.lua b/home/dot_config/nvim/lua/plugins/lang/markdown/obsidian-nvim.lua index 0b1aa92..032d574 100644 --- a/home/dot_config/nvim/lua/plugins/lang/markdown/obsidian-nvim.lua +++ b/home/dot_config/nvim/lua/plugins/lang/markdown/obsidian-nvim.lua @@ -58,6 +58,9 @@ return { "ibhagwan/fzf-lua", }, opts = { + footer = { + enabled = false, + }, workspaces = { { name = "personal", @@ -132,14 +135,14 @@ return { return string.format("%s-", os.time()) end, }, - mappings = { - [""] = { - action = function() - require("obsidian").util.smart_action() - end, - opts = { buffer = true, expr = true }, - }, - }, + -- mappings = { + -- [""] = { + -- action = function() + -- require("obsidian").util.smart_action() + -- end, + -- opts = { buffer = true, expr = true }, + -- }, + -- }, new_notes_location = "current_dir", }, } diff --git a/home/dot_config/nvim/lua/plugins/mod/snacks-nvim.lua b/home/dot_config/nvim/lua/plugins/mod/snacks-nvim.lua index 85c1a34..ee398cc 100644 --- a/home/dot_config/nvim/lua/plugins/mod/snacks-nvim.lua +++ b/home/dot_config/nvim/lua/plugins/mod/snacks-nvim.lua @@ -81,7 +81,7 @@ return { -- words = { enabled = true }, image = { enabled = true, - img_dirs = { "_Global/Assets" } + img_dirs = { "90 - System/Assets" } }, }, keys = { diff --git a/home/dot_config/nvim/luarc.jsonc b/home/dot_config/nvim/luarc.jsonc new file mode 100644 index 0000000..30c5223 --- /dev/null +++ b/home/dot_config/nvim/luarc.jsonc @@ -0,0 +1,20 @@ +{ + "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json", + "runtime": { + "version": "LuaJIT" + }, + "workspace": { + "checkThirdParty" : false, + "library": [ + // Runtime and builtin libraries + "$VIMRUNTIME", + "${3rd}/luv/library" + ], + "ignoreDir": [ + "luasnippets" + ] + }, + "diagnostics.disable": [ + "missing-fields" + ] +} diff --git a/home/dot_config/zed/keymap.json b/home/dot_config/zed/keymap.json index 6b28d81..1030004 100644 --- a/home/dot_config/zed/keymap.json +++ b/home/dot_config/zed/keymap.json @@ -74,6 +74,9 @@ "ctrl-w l": "workspace::ActivatePaneRight", "ctrl-w k": "workspace::ActivatePaneUp", "ctrl-w j": "workspace::ActivatePaneDown", + "ctrl-w alt-h": "workspace::ToggleLeftDock", + "ctrl-w alt-l": "workspace::ToggleRightDock", + "ctrl-w alt-j": "workspace::ToggleBottomDock", "[ d": "editor::GoToPreviousDiagnostic", "] d": "editor::GoToDiagnostic", "[ g": "editor::GoToPreviousHunk", diff --git a/nixcfgs/users/js0ny/packages/cli.nix b/nixcfgs/users/js0ny/packages/cli.nix index aa266d1..e3c8edb 100644 --- a/nixcfgs/users/js0ny/packages/cli.nix +++ b/nixcfgs/users/js0ny/packages/cli.nix @@ -50,5 +50,6 @@ ta-lib ddgr protonvpn-cli + markdown-oxide ]; } diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix index 023da45..a2a99f4 100644 --- a/nixcfgs/users/js0ny/packages/gui.nix +++ b/nixcfgs/users/js0ny/packages/gui.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { home.packages = with pkgs; [ kitty ghostty @@ -31,6 +30,6 @@ qbittorrent protonvpn-gui proton-pass - protonmail-bridge + protonmail-bridge-gui ]; } diff --git a/nixcfgs/users/js0ny/programs/gnome.nix b/nixcfgs/users/js0ny/programs/gnome.nix index 4630165..26f375a 100644 --- a/nixcfgs/users/js0ny/programs/gnome.nix +++ b/nixcfgs/users/js0ny/programs/gnome.nix @@ -2,6 +2,7 @@ home.packages = with pkgs; [ gnome-tweaks sushi + dconf-editor gnomeExtensions.dash-to-dock gnomeExtensions.caffeine gnomeExtensions.logo-menu @@ -27,6 +28,8 @@ dconf.settings = { "org/gnome/desktop/interface" = { + clock-show-seconds = true; + clock-show-weekday = true; icon-theme = "Papirus"; accent-color = "pink"; show-battery-percentage = true; @@ -46,12 +49,33 @@ }; "org/gnome/shell" = { favorite-apps = [ - "org.kde.dolphin.desktop" "com.mitchellh.ghostty.desktop" "firefox.desktop" "code.desktop" ]; }; + "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-0" = { + name = "Open File Explorer"; + command = "dolphin"; + binding = "e"; + }; + "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-1" = { + name = "Open Terminal via Win-R"; + command = "ghostty"; + binding = "r"; + }; + "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-2" = { + name = "Open Terminal via Ctrl-Alt-T"; + command = "ghostty"; + binding = "t"; + }; + "org/gnome/settings-daemon/plugins/media-keys" = { + custom-keybindings = [ + "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-0/" + "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-1/" + "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom-2/" + ]; + }; }; # qt.style.name = "adwaita";