diff options
| -rw-r--r-- | flake.lock | 102 | ||||
| -rw-r--r-- | mut/neovim/fnl/conf/init.fnl | 11 | ||||
| -rw-r--r-- | profiles/core/configuration.nix | 2 |
3 files changed, 19 insertions, 96 deletions
@@ -1,39 +1,5 @@ { "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -54,38 +20,18 @@ "type": "github" } }, - "nixos-wsl": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1696883888, - "narHash": "sha256-EdQMeJxDoi26YDtkNf20mNBeCj7Y5eKg+rrxkiB86z0=", - "owner": "nix-community", - "repo": "NixOS-WSL", - "rev": "5da7c4fd0ab9693d83cae50de7d9430696f92568", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NixOS-WSL", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1696697597, - "narHash": "sha256-q26Qv4DQ+h6IeozF2o1secyQG0jt2VUT3V0K58jr3pg=", - "owner": "NixOS", + "lastModified": 1696879762, + "narHash": "sha256-Ud6bH4DMcYHUDKavNMxAhcIpDGgHMyL/yaDEAVSImQY=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "5a237aecb57296f67276ac9ab296a41c23981f56", + "rev": "f99e5f03cc0aa231ab5950a15ed02afec45ed51a", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-23.05", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -108,22 +54,6 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1696879762, - "narHash": "sha256-Ud6bH4DMcYHUDKavNMxAhcIpDGgHMyL/yaDEAVSImQY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f99e5f03cc0aa231ab5950a15ed02afec45ed51a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { "lastModified": 1696693680, "narHash": "sha256-PH0HQTkqyj7DmdPKPwrrXwVURLBqzZs4nqnDw9q8mhg=", "owner": "NixOS", @@ -141,14 +71,13 @@ "root": { "inputs": { "home-manager": "home-manager", - "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "sops-nix": "sops-nix" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -164,21 +93,6 @@ "repo": "sops-nix", "type": "github" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/mut/neovim/fnl/conf/init.fnl b/mut/neovim/fnl/conf/init.fnl index e3b56d5..3551c3a 100644 --- a/mut/neovim/fnl/conf/init.fnl +++ b/mut/neovim/fnl/conf/init.fnl @@ -79,8 +79,17 @@ (local lines (icollect [_ l (ipairs lines)] (if (not= l "") (prettify l)))) + (local is-at-last-line (let [[n lnum & rest] (vim.fn.getcurpos) + last-line (vim.api.nvim_buf_line_count 0)] + (do + (= lnum last-line)))) (vim.fn.setqflist [] :a {: id : title : lines}) - (vim.cmd ":cbottom")))) + (local is-qf? (= (vim.opt_local.buftype:get) "quickfix")) + (P [(not is-qf?) is-at-last-line]) + (if (or + (not is-qf?) + (and is-at-last-line is-qf?)) + (vim.cmd ":cbottom"))))) (var last_job nil) (local job diff --git a/profiles/core/configuration.nix b/profiles/core/configuration.nix index 545d7fa..9b72283 100644 --- a/profiles/core/configuration.nix +++ b/profiles/core/configuration.nix @@ -26,7 +26,7 @@ curl pinentry-curses gnused - gnugrep + # gnugrep htop dnsutils iputils |