diff --git a/home/dot_config/nvim/lsp/tinymist.lua b/home/dot_config/nvim/lsp/tinymist.lua new file mode 100644 index 0000000..db697dd --- /dev/null +++ b/home/dot_config/nvim/lsp/tinymist.lua @@ -0,0 +1,26 @@ +---@type vim.lsp.Config +return { + cmd = { 'tinymist' }, + filetypes = { 'typst' }, + root_markers = { '.git' }, + on_attach = function(client, bufnr) + for _, command in ipairs { + 'tinymist.exportSvg', + 'tinymist.exportPng', + 'tinymist.exportPdf', + -- 'tinymist.exportHtml', -- Use typst 0.13 + 'tinymist.exportMarkdown', + 'tinymist.exportText', + 'tinymist.exportQuery', + 'tinymist.exportAnsiHighlight', + 'tinymist.getServerInfo', + 'tinymist.getDocumentTrace', + 'tinymist.getWorkspaceLabels', + 'tinymist.getDocumentMetrics', + 'tinymist.pinMain', + } do + local cmd_func, cmd_name, cmd_desc = create_tinymist_command(command, client, bufnr) + vim.api.nvim_buf_create_user_command(bufnr, 'Lsp' .. cmd_name, cmd_func, { nargs = 0, desc = cmd_desc }) + end + end, +} diff --git a/home/dot_config/nvim/lua/config/colorscheme.lua b/home/dot_config/nvim/lua/config/colorscheme.lua index 8d64750..3df70e9 100644 --- a/home/dot_config/nvim/lua/config/colorscheme.lua +++ b/home/dot_config/nvim/lua/config/colorscheme.lua @@ -40,3 +40,6 @@ else vim.o.background = 'light' vim.cmd.colorscheme("rose-pine") end + +vim.cmd.colorscheme("rose-pine-moon") + diff --git a/home/dot_config/nvim/lua/config/options.lua b/home/dot_config/nvim/lua/config/options.lua index c2d1b9c..98ec308 100644 --- a/home/dot_config/nvim/lua/config/options.lua +++ b/home/dot_config/nvim/lua/config/options.lua @@ -73,3 +73,8 @@ vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos, vim.o.mousemoveevent = true vim.fn.matchadd("Conceal", [[\%u200b]], 10, -1, { conceal = "" }) + +-- Grep + +opt.grepformat = "%f:%l:%c:%m" +opt.grepprg = "rg --vimgrep" diff --git a/home/dot_config/nvim/lua/keymaps/buffer.lua b/home/dot_config/nvim/lua/keymaps/buffer.lua index 61352e2..1df8ae8 100644 --- a/home/dot_config/nvim/lua/keymaps/buffer.lua +++ b/home/dot_config/nvim/lua/keymaps/buffer.lua @@ -39,7 +39,7 @@ local bufmap = { { mode = "n", keys = "mx", cmd = "!chmod u+x %", opt = { desc = "Mark the file as executable" } }, }, json = { - { mode = "n", keys ="mp", cmd = "%!jq", opt = { desc = "Prettify json"} } + { mode = "n", keys = "mp", cmd = "%!jq", opt = { desc = "Prettify json" } }, }, } diff --git a/home/dot_config/yazi/init.lua b/home/dot_config/yazi/init.lua index 7865b7f..c8d8f0c 100644 --- a/home/dot_config/yazi/init.lua +++ b/home/dot_config/yazi/init.lua @@ -1,3 +1,18 @@ -- ~/.config/yazi/init.lua + +function Linemode:size_and_mtime() + local time = math.floor(self._file.cha.mtime or 0) + if time == 0 then + time = "" + elseif os.date("%Y", time) == os.date("%Y") then + time = os.date("%m-%d %H:%M", time) + else + time = os.date("%Y-%m-%d", time) + end + + local size = self._file:size() + return string.format("%s %s", size and ya.readable_size(size) or "/", time) +end + require("starship"):setup() require("git"):setup() diff --git a/home/dot_config/yazi/yazi.toml b/home/dot_config/yazi/yazi.toml index 0a8a312..2b68a8f 100644 --- a/home/dot_config/yazi/yazi.toml +++ b/home/dot_config/yazi/yazi.toml @@ -1,6 +1,7 @@ [mgr] show_hidden = true -linemode = "size_and_mtime" +linemode = "size_and_mtime" # See ./init.lua Linemode:size_and_mtime [preview] wrap = "yes" + diff --git a/nixcfgs/modules/nixos/desktop/keyd.nix b/nixcfgs/modules/nixos/desktop/keyd.nix deleted file mode 100644 index 792f137..0000000 --- a/nixcfgs/modules/nixos/desktop/keyd.nix +++ /dev/null @@ -1,17 +0,0 @@ -{pkgs, ...}: { - environment.systemPackages = with pkgs; [ - keyd - ]; - - services.keyd = { - enable = true; - keyboards = { - ids = ["*"]; - settings = { - main = { - capslock = "overload(control, esc)"; - }; - }; - }; - }; -} diff --git a/nixcfgs/users/js0ny/packages/cli.nix b/nixcfgs/users/js0ny/packages/cli.nix index d3c949e..339cbe8 100644 --- a/nixcfgs/users/js0ny/packages/cli.nix +++ b/nixcfgs/users/js0ny/packages/cli.nix @@ -46,14 +46,14 @@ ghostscript # Misc ta-lib ddgr protonvpn-cli markdown-oxide - nushell powershell - powershell-editor-services - package-version-server gemini-cli codex imagemagick miniserve jq + srm + mediainfo + exiftool ]; } diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix index af42ba7..8716466 100644 --- a/nixcfgs/users/js0ny/packages/gui.nix +++ b/nixcfgs/users/js0ny/packages/gui.nix @@ -17,7 +17,15 @@ mpv haruna + # Email + protonmail-bridge + thunderbird + birdtray + + # Theming papirus-icon-theme + rose-pine-cursor + pcloud telegram-desktop steam @@ -52,12 +60,6 @@ zotero anki-bin feishin - rose-pine-cursor - - # Email - protonmail-bridge - thunderbird - birdtray ]; home.sessionVariables = { diff --git a/nixcfgs/users/js0ny/programs/desktop/plasma/default.nix b/nixcfgs/users/js0ny/programs/desktop/plasma/default.nix index 644902b..45958cb 100644 --- a/nixcfgs/users/js0ny/programs/desktop/plasma/default.nix +++ b/nixcfgs/users/js0ny/programs/desktop/plasma/default.nix @@ -11,6 +11,7 @@ # kdePackages.yakuake krunner-vscodeprojects jetbrains-runner + plasmusic-toolbar ]; home.sessionVariables = { QT_STYLE_OVERRIDE = "Breeze"; diff --git a/nixcfgs/users/js0ny/programs/shell/zsh.nix b/nixcfgs/users/js0ny/programs/shell/zsh.nix index aa8252a..4bae8fb 100644 --- a/nixcfgs/users/js0ny/programs/shell/zsh.nix +++ b/nixcfgs/users/js0ny/programs/shell/zsh.nix @@ -7,6 +7,7 @@ in { home.packages = with pkgs; [ zsh-fzf-tab + zsh-nix-shell ]; programs.zsh = { enable = true; @@ -46,7 +47,7 @@ in { # Globbing setopt EXTENDED_GLOB # Extended globbing - setopt GLOB_DOTS # Include dotfiles in globbing + # setopt GLOB_DOTS # Include dotfiles in globbing # Error correction setopt CORRECT # Suggest corrections for commands