From 4c17e30aa8651c20d6639ab8e41090370075a682 Mon Sep 17 00:00:00 2001 From: cy Date: Sun, 5 Jan 2025 06:02:42 -0500 Subject: [PATCH] nix fmt --- flake.nix | 29 ++++++++++------- home/nvim/init.lua | 70 +++++++++++++++++++++------------------- hosts/chunk/attic.nix | 2 +- hosts/chunk/postgres.nix | 3 +- 4 files changed, 56 insertions(+), 48 deletions(-) diff --git a/flake.nix b/flake.nix index 91cd712..4a6668f 100644 --- a/flake.nix +++ b/flake.nix @@ -69,20 +69,25 @@ (overlayPkgsFromFlake inputs.nixpkgs-stable [ # "prometheus" # fails to build on unstable ]) - (final: prev: { + (_final: prev: { conduwuit = prev.conduwuit.override (old: { rustPlatform = old.rustPlatform // { - buildRustPackage = args: old.rustPlatform.buildRustPackage (args // { - version = "0.4.6"; - src = prev.fetchFromGitHub { - owner = "girlbossceo"; - repo = "conduwuit"; - rev = "c7ae9516767dff6767a725be3d144164c0d1ad56"; - hash = "sha256-llE6EPE70iV7gGz2c2uhRAQIhRe57cYaXfA4NnbRtrM="; - }; - cargoHash = "sha256-5KXFei6A12QrFattkbDZM2LuLueV+aKunDgy6ZAaF7E="; - doCheck = false; - }); + buildRustPackage = + args: + old.rustPlatform.buildRustPackage ( + args + // { + version = "0.4.6"; + src = prev.fetchFromGitHub { + owner = "girlbossceo"; + repo = "conduwuit"; + rev = "c7ae9516767dff6767a725be3d144164c0d1ad56"; + hash = "sha256-llE6EPE70iV7gGz2c2uhRAQIhRe57cYaXfA4NnbRtrM="; + }; + cargoHash = "sha256-5KXFei6A12QrFattkbDZM2LuLueV+aKunDgy6ZAaF7E="; + doCheck = false; + } + ); }; }); }) diff --git a/home/nvim/init.lua b/home/nvim/init.lua index 332d61d..df1f89f 100644 --- a/home/nvim/init.lua +++ b/home/nvim/init.lua @@ -53,43 +53,47 @@ opt.guicursor = "i-ci-ve:ver25-blinkon500-blinkon500" -- as event. It seems that when BufReadPost is triggered, FileType event is still not run. -- So the filetype for this buffer is empty string. api.nvim_create_autocmd("FileType", { - group = api.nvim_create_augroup("resume_cursor_position", { clear = true }), - pattern = "*", - callback = function(ev) - local mark_pos = api.nvim_buf_get_mark(ev.buf, '"') - local last_cursor_line = mark_pos[1] + group = api.nvim_create_augroup("resume_cursor_position", { clear = true }), + pattern = "*", + callback = function(ev) + local mark_pos = api.nvim_buf_get_mark(ev.buf, '"') + local last_cursor_line = mark_pos[1] - local max_line = vim.fn.line("$") - local buf_filetype = api.nvim_get_option_value("filetype", { buf = ev.buf }) - local buftype = api.nvim_get_option_value("buftype", { buf = ev.buf }) + local max_line = vim.fn.line("$") + local buf_filetype = api.nvim_get_option_value("filetype", { buf = ev.buf }) + local buftype = api.nvim_get_option_value("buftype", { buf = ev.buf }) - -- only handle normal files - if buf_filetype == "" or buftype ~= "" then - return - end + -- only handle normal files + if buf_filetype == "" or buftype ~= "" then + return + end - -- Only resume last cursor position when there is no go-to-line command (something like '+23'). - if vim.fn.match(vim.v.argv, [[\v^\+(\d){1,}$]]) ~= -1 then - return - end + -- Only resume last cursor position when there is no go-to-line command (something like '+23'). + if vim.fn.match(vim.v.argv, [[\v^\+(\d){1,}$]]) ~= -1 then + return + end - if last_cursor_line > 1 and last_cursor_line <= max_line then - -- vim.print(string.format("mark_pos: %s", vim.inspect(mark_pos))) - -- it seems that without vim.schedule, the cursor position can not be set correctly - vim.schedule(function() - local status, result = pcall(api.nvim_win_set_cursor, 0, mark_pos) - if not status then - api.nvim_err_writeln( - string.format("Failed to resume cursor position. Context %s, error: %s", vim.inspect(ev), result) - ) - end - end) - -- the following two ways also seem to work, - -- ref: https://www.reddit.com/r/neovim/comments/104lc26/how_can_i_press_escape_key_using_lua/ - -- vim.api.nvim_feedkeys("g`\"", "n", true) - -- vim.fn.execute("normal! g`\"") - end - end, + if last_cursor_line > 1 and last_cursor_line <= max_line then + -- vim.print(string.format("mark_pos: %s", vim.inspect(mark_pos))) + -- it seems that without vim.schedule, the cursor position can not be set correctly + vim.schedule(function() + local status, result = pcall(api.nvim_win_set_cursor, 0, mark_pos) + if not status then + api.nvim_err_writeln( + string.format( + "Failed to resume cursor position. Context %s, error: %s", + vim.inspect(ev), + result + ) + ) + end + end) + -- the following two ways also seem to work, + -- ref: https://www.reddit.com/r/neovim/comments/104lc26/how_can_i_press_escape_key_using_lua/ + -- vim.api.nvim_feedkeys("g`\"", "n", true) + -- vim.fn.execute("normal! g`\"") + end + end, }) keymap.set("n", "s", require("nvim-tree.api").tree.toggle, { diff --git a/hosts/chunk/attic.nix b/hosts/chunk/attic.nix index a5d264e..5048719 100644 --- a/hosts/chunk/attic.nix +++ b/hosts/chunk/attic.nix @@ -1,4 +1,4 @@ -{config, ...}: +{ config, ... }: { services.atticd = { enable = true; diff --git a/hosts/chunk/postgres.nix b/hosts/chunk/postgres.nix index b0e48ac..07a3125 100644 --- a/hosts/chunk/postgres.nix +++ b/hosts/chunk/postgres.nix @@ -17,8 +17,7 @@ name = "atticd"; ensureDBOwnership = true; } - ] - ; + ]; }; services.postgresqlBackup = { enable = true;