diff --git a/flake.lock b/flake.lock index 1b508a3..f2216e3 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,30 @@ { "nodes": { + "bun2nix": { + "inputs": { + "flake-parts": "flake-parts", + "import-tree": "import-tree", + "nixpkgs": [ + "hunk", + "nixpkgs" + ], + "systems": "systems", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1770895533, + "narHash": "sha256-v3QaK9ugy9bN9RXDnjw0i2OifKmz2NnKM82agtqm/UY=", + "owner": "nix-community", + "repo": "bun2nix", + "rev": "c843f477b15f51151f8c6bcc886954699440a6e1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "bun2nix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -34,9 +59,27 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1681202837, @@ -94,6 +137,42 @@ "type": "github" } }, + "hunk": { + "inputs": { + "bun2nix": "bun2nix", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1781895871, + "narHash": "sha256-UCuRKnUuDWJ7kcEHCYRV+p/LT7lYkCRzYrz9udm1vC0=", + "owner": "modem-dev", + "repo": "hunk", + "rev": "c05558cd8dbdf61a8e11bfc8378d9d619e4c0d8d", + "type": "github" + }, + "original": { + "owner": "modem-dev", + "repo": "hunk", + "type": "github" + } + }, + "import-tree": { + "locked": { + "lastModified": 1763762820, + "narHash": "sha256-ZvYKbFib3AEwiNMLsejb/CWs/OL/srFQ8AogkebEPF0=", + "owner": "vic", + "repo": "import-tree", + "rev": "3c23749d8013ec6daa1d7255057590e9ca726646", + "type": "github" + }, + "original": { + "owner": "vic", + "repo": "import-tree", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -188,6 +267,21 @@ "type": "github" } }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1769909678, + "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "72716169fe93074c333e8d0173151350670b824c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-opencode": { "locked": { "lastModified": 1777270315, @@ -256,6 +350,7 @@ "inputs": { "home-manager": "home-manager", "home-manager-wsl": "home-manager-wsl", + "hunk": "hunk", "nix-darwin": "nix-darwin", "nixos-vscode-server": "nixos-vscode-server", "nixos-wsl": "nixos-wsl", @@ -302,9 +397,24 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tasksquire": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_2" }, "locked": { @@ -321,6 +431,28 @@ "type": "git", "url": "ssh://git@git.pander.me/martin/tasksquire.git" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "hunk", + "bun2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1770228511, + "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d8c336d..3f603f9 100644 --- a/flake.nix +++ b/flake.nix @@ -46,6 +46,11 @@ tasksquire = { url = "git+ssh://git@git.pander.me/martin/tasksquire.git?ref=dev"; }; + + hunk = { + url = "github:modem-dev/hunk"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, nixpkgs, nixpkgs-stable, nixpkgs-wsl-stable, nixpkgs-opencode, nixos-wsl, home-manager, home-manager-wsl, nix-darwin, ... }@inputs: diff --git a/modules/home/dev.nix b/modules/home/dev.nix index c866e02..86fc950 100644 --- a/modules/home/dev.nix +++ b/modules/home/dev.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, inputs, ... }: let cfg = config.dot.llm; @@ -40,6 +40,7 @@ in visidata codespelunker jq + inputs.hunk.packages.${pkgs.stdenv.hostPlatform.system}.hunk ]; } diff --git a/modules/home/task.nix b/modules/home/task.nix index 0e12f85..29b0618 100644 --- a/modules/home/task.nix +++ b/modules/home/task.nix @@ -24,26 +24,26 @@ urgency.user.tag.cust.coefficient = 5.0; urgency.user.tag.fixed.coefficient = -100.0; - report.next.columns="id,start.age,entry.age,depends,priority,energy,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency"; - report.next.labels="ID,Active,Age,Deps,P,E,Project,Tag,Recur,S,Due,Until,Description,Urg"; + report.next.columns="id,start.age,entry.age,depends,priority,energy,urgency,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description"; + report.next.labels="ID,Active,Age,Deps,P,E,Urg,Project,Tag,Recur,S,Due,Until,Description"; report.next.filter="status:pending -WAITING -deferred -track"; - report.time.columns="id,start.age,entry.age,depends,priority,energy,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency"; - report.time.labels="ID,Active,Age,Deps,P,E,Project,Tag,Recur,S,Due,Until,Description,Urg"; + report.time.columns="id,start.age,entry.age,depends,priority,energy,urgency,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description"; + report.time.labels="ID,Active,Age,Deps,P,E,Urg,Project,Tag,Recur,S,Due,Until,Description"; report.time.filter="status:pending -WAITING -deferred +fixed"; - report.deferred.columns="id,start.age,entry.age,depends,priority,energy,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency"; + report.deferred.columns="id,start.age,entry.age,depends,priority,energy,urgency,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description"; report.deferred.context="1"; report.deferred.description="Deferred and waiting tasks"; - report.deferred.labels="ID,Active,Age,Deps,P,E,Project,Tag,Recur,S,Due,Until,Description,Urg"; + report.deferred.labels="ID,Active,Age,Deps,P,E,Urg,Project,Tag,Recur,S,Due,Until,Description"; report.deferred.filter="status:pending +deferred"; report.deferred.sort="urgency-"; - report.low.columns="id,start.age,entry.age,depends,priority,energy,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency"; + report.low.columns="id,start.age,entry.age,depends,priority,energy,urgency,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description"; report.low.context="1"; report.low.description="Low energy tasks"; report.low.filter="status:pending -WAITING -deferred"; - report.low.labels="ID,Active,Age,Deps,P,E,Project,Tag,Recur,S,Due,Until,Description,Urg"; + report.low.labels="ID,Active,Age,Deps,P,E,Urg,Project,Tag,Recur,S,Due,Until,Description"; report.low.sort="energy+,urgency-"; context.today.read = "(prio:H or +next)"; diff --git a/modules/nvim/lua/filetype.lua b/modules/nvim/lua/filetype.lua index 9c25ac6..bd6c0a7 100644 --- a/modules/nvim/lua/filetype.lua +++ b/modules/nvim/lua/filetype.lua @@ -10,6 +10,10 @@ vim.lsp.config('gopls', { hints = { assignVariableTypes = true, compositeLiteralFields = true, + compositeLiteralTypes = true, + constantValues = true, + functionTypeParameters = true, + rangeVariableTypes = true, parameterNames = true, }, analyses = {