diff --git a/nix/flake.lock b/nix/flake.lock index 553d2e8..2d22407 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1764034279, - "narHash": "sha256-hZH6EHQYFifVg0bmSBYT8Art5BWhXBXE307uPLnexY0=", + "lastModified": 1768798936, + "narHash": "sha256-eHld4id3TeD9Sxx5vgv58BnTl1fz+ewIKspz/kEoAE8=", "owner": "nix-community", "repo": "home-manager", - "rev": "381f4f8a3a5f773cb80d2b7eb8f8d733b8861434", + "rev": "2954aa29441a1a98901362e4d35515875761ad65", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1763505477, - "narHash": "sha256-nJRd4LY2kT3OELfHqdgWjvToNZ4w+zKCMzS2R6z4sXE=", + "lastModified": 1768764703, + "narHash": "sha256-5ulSDyOG1U+1sJhkJHYsUOWEsmtLl97O0NTVMvgIVyc=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "3bda9f6b14161becbd07b3c56411f1670e19b9b5", + "rev": "0fc4e7ac670a0ed874abacf73c4b072a6a58064b", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763835633, - "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { diff --git a/nix/user/dev.nix b/nix/user/dev.nix index d1e6e37..4261a02 100644 --- a/nix/user/dev.nix +++ b/nix/user/dev.nix @@ -10,5 +10,7 @@ home.packages = with pkgs; [ visidata claude-code + opencode + # crush ]; } diff --git a/nix/user/sh.nix b/nix/user/sh.nix index 00b2b50..620b855 100644 --- a/nix/user/sh.nix +++ b/nix/user/sh.nix @@ -94,8 +94,10 @@ ripgrep-all viddy duf - (python3.withPackages(ps: [ ps.llm ps.llm-gemini ])) - #nerdfonts + # (llm.withPlugins (ps: [ + # ps.llm-gemini + # ps.llm-claude + # ])) ]; home.sessionVariables = lib.mkMerge [ { diff --git a/nix/user/task.nix b/nix/user/task.nix index 0bede22..6ec7435 100644 --- a/nix/user/task.nix +++ b/nix/user/task.nix @@ -8,9 +8,6 @@ config = { weekstart = "monday"; - context.today.read = "(prio:H or +next)"; - context.today.write = "prio:H +next"; - uda.energy.type="string"; uda.energy.label="Energy"; uda.energy.values="h,m,l"; @@ -20,11 +17,16 @@ urgency.uda.priority.L.coefficient = -0.5; urgency.user.tag.deferred.coefficient = -15.0; 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.filter="status:pending -WAITING -deferred"; + 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.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.context="1"; report.deferred.description="Deferred and waiting tasks"; @@ -39,6 +41,8 @@ report.low.labels="ID,Active,Age,Deps,P,E,Project,Tag,Recur,S,Due,Until,Description,Urg"; report.low.sort="energy+,urgency-"; + context.today.read = "(prio:H or +next)"; + context.today.write = "prio:H +next"; context.deferred.read = "+deferred"; context.deferred.write = "+deferred"; context.customer.read = "+cust"; diff --git a/nvim/plugins.lua b/nvim/plugins.lua index 0335c5b..1d73bd4 100644 --- a/nvim/plugins.lua +++ b/nvim/plugins.lua @@ -181,27 +181,27 @@ require("telescope").setup { require("telescope").load_extension("ui-select") require("telescope").load_extension("yank_history") -require'nvim-treesitter.configs'.setup { - -- ensure_installed = { "lua", "vim", "help" }, - ensure_installed = {}, - sync_install = false, - auto_install = false, - - - highlight = { - enable = true, - - disable = function(lang, buf) - local max_filesize = 100 * 1024 -- 100 KB - local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf)) - if ok and stats and stats.size > max_filesize then - return true - end - end, - - additional_vim_regex_highlighting = false, - }, -} +-- require'nvim-treesitter.configs'.setup { +-- -- ensure_installed = { "lua", "vim", "help" }, +-- ensure_installed = {}, +-- sync_install = false, +-- auto_install = false, +-- +-- +-- highlight = { +-- enable = true, +-- +-- disable = function(lang, buf) +-- local max_filesize = 100 * 1024 -- 100 KB +-- local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf)) +-- if ok and stats and stats.size > max_filesize then +-- return true +-- end +-- end, +-- +-- additional_vim_regex_highlighting = false, +-- }, +-- } require('lualine').setup({ options = {