Update nvim

nix/common.nix

@@ -51,8 +51,6 @@
 
   #home.shellAliases = {
     # "ll" = "ls -la";
-  #};
-  # home.shellAliases = {
   #   "t" = "tmuxp";
   #   "tl" = "tmuxp load";
   # };

nix/flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1740579671,
-        "narHash": "sha256-Dwt/3KknOQ4bgFG5YjqDT7oWRy27rPpDjAi2P0ok1zw=",
+        "lastModified": 1745810134,
+        "narHash": "sha256-WfnYH/i7DFzn4SESQfWviXiNUZjohZhzODqLwKYHIPI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "53c587d263f94aaf6a281745923c76bbec62bcf3",
+        "rev": "be7cf1709b469a2a2c62169172a167d1fed3509f",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1740452771,
-        "narHash": "sha256-/tI1vFJ7/dXJqUmI+s0EV1F0DPe6dZvT444mrLUkrlU=",
+        "lastModified": 1745816321,
+        "narHash": "sha256-Gyh/fkCDqVNGM0BWvk+4UAS17w2UI6iwnbQQCmc1TDI=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "42be12b510253d750138ec90c66decc282298b44",
+        "rev": "4515dacafb0ccd42e5395aacc49fd58a43027e01",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1740367490,
-        "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
+        "lastModified": 1745526057,
+        "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
+        "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
         "type": "github"
       },
       "original": {

nix/flake.nix

@@ -13,7 +13,8 @@
 
   outputs = { self, nix-darwin, nixpkgs, home-manager, ... }:
     let
-      system = "x86_64-darwin";
+      #system = "x86_64-darwin";
+      system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
 
       configuration = { pkgs, ... }: {
@@ -60,6 +61,7 @@
             ./user/task_home.nix
           ];
         };
+
         "martin" = home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
 
@@ -69,6 +71,7 @@
             ./user/task_home.nix
           ];
         };
+
         "pan" = home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
 

nix/user/dev.nix

@@ -8,4 +8,8 @@
   };
 
   programs.ripgrep.enable = true;
+
+  # home.packages = with pkgs; [
+  #   harlequin
+  # ];
 }

nix/user/git.nix

@@ -11,8 +11,10 @@
       br = "branch";
       pl = "pull";
       ps = "push";
+      sw = "switch";
       mno =" merge --no-ff";
-      lg = "log --color --graph --pretty=format:'%cred%h%creset -%c(yellow)%d%creset %s %cgreen(%cr)%c(bold blue)<%an>%creset' --abbrev-commit";
+      lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit";
+      cleanup = "!git fetch --prune && git branch -vv | grep ': gone]' | awk '{print $1}' | xargs git branch -D";
     };
 
     difftastic.enable = true;

nix/user/nvim.nix

@@ -13,6 +13,7 @@
       vim-commentary
       vim-repeat
       vim-surround
+      nvim-tree-lua
       targets-vim
       delimitMate
       # vim-startify
@@ -42,6 +43,7 @@
       img-clip-nvim
       markdown-preview-nvim
       vim-markdown
+      bullets-vim
       (nvim-treesitter.withPlugins (p: [ p.awk p.bash p.c p.c_sharp p.cpp p.css p.diff p.dockerfile p.doxygen p.git_config p.gitcommit p.go p.gomod p.gosum p.gotmpl p.helm p.haskell p.html p.http p.java p.javascript p.json p.latex p.lua p.markdown p.markdown_inline p.matlab p.nix p.printf p.python p.regex p.rust p.sql p.strace p.supercollider p.svelte p.swift p.terraform p.tmux p.toml p.typescript p.vim p.xml p.yaml p.zig ]))
     ];
 

nix/user/sh.nix

@@ -60,7 +60,8 @@
 
   programs.lsd = {
     enable = true;
-    enableAliases = true;
+    # enableAliases = true;
+    enableZshIntegration = true;
   };
 
   programs.zoxide = {
@@ -79,12 +80,16 @@
     du-dust
     glow
     ripgrep-all
-    llm
-    #nerdfonts
+    (python3.withPackages (ps: [ ps.llm ps.llm-gemini]))
   ];
 
   home.sessionVariables = lib.mkMerge [ {
       BAT_THEME = "Coldark-Cold";
     }
   ];
+
+  home.shellAliases = lib.mkMerge [ {
+      open = "explorer.exe .";
+    }
+  ];
 }

nix/user/task.nix

@@ -8,13 +8,37 @@
     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";
+      uda.energy.default="m";
+
       uda.priority.values = "H,M,,L";
       urgency.uda.priority.L.coefficient = -0.5;
       urgency.user.tag.deferred.coefficient = -15.0;
       urgency.user.tag.cust.coefficient = 5.0;
 
-      context.today.read = "-deferred and (prio:H or +next)";
-      context.today.write = "prio:H or +next";
+      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.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";
+      report.deferred.labels="ID,Active,Age,Deps,P,E,Project,Tag,Recur,S,Due,Until,Description,Urg";
+      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.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.sort="energy+,urgency-";
+
       context.deferred.read = "+deferred";
       context.deferred.write = "+deferred";
       context.customer.read = "+cust";

nvim/base.lua

@@ -1,3 +1,6 @@
+vim.g.loaded_netrw = 1
+vim.g.loaded_netrwPlugin = 1
+
 -------------------------
 -------- OPTIONS --------
 -------------------------
@@ -46,14 +49,15 @@ vim.opt.autoread = true
 vim.opt.syntax = 'on'
 vim.opt.encoding = 'utf-8'
 vim.opt.completeopt = 'menu,menuone,noselect'
+vim.opt.termguicolors = true
 
 
 ----------------------------
 -------- CLIPBOARD ---------
 ----------------------------
--- if vim.fn.has("wsl") == 1 then
-vim.opt.clipboard:append('unnamedplus')
--- end
+if vim.fn.has("wsl") == 1 then
+  vim.opt.clipboard = vim.opt.clipboard + 'unnamedplus'
+end
 
 
 ----------------------------
@@ -84,6 +88,40 @@ vim.api.nvim_create_autocmd('BufEnter', {
    command = 'silent! lcd %:p:h'
 })
 
+-- Open nvim-tree when starting Neovim in a specific directory or any of its subdirectories
+vim.api.nvim_create_autocmd("VimEnter", {
+  callback = function()
+    local args = vim.fn.argv()
+    
+    if #args > 0 then
+      local current_dir = vim.fn.fnamemodify(args[1], ":p:h")
+      local dir_name = vim.fn.fnamemodify(current_dir, ":t")
+      
+      -- Check if in a "notes" directory or its subdirectory
+      local in_notes = dir_name == "notes"
+      if not in_notes then
+        -- Check if any parent directory is named "notes"
+        local path_parts = vim.split(current_dir, "/", {plain = true})
+        for i, part in ipairs(path_parts) do
+          if part == "notes" then
+            in_notes = true
+            break
+          end
+        end
+      end
+      
+      -- If in a notes directory or subdirectory, open the tree
+      if in_notes then
+        require("nvim-tree.api").tree.open()
+        vim.defer_fn(function()
+          require("nvim-tree.api").tree.expand_all()
+          -- After expanding, return focus to the main window/buffer
+          vim.cmd("wincmd p")
+        end, 100) -- Small delay to ensure tree is fully loaded before expanding
+      end
+    end
+  end
+})
 
 ---------------------------
 -------- FUNCTIONS --------
@@ -92,3 +130,4 @@ vim.api.nvim_create_autocmd('BufEnter', {
 vim.api.nvim_create_user_command('TrimWhiteSpace', function()
    vim.cmd('%s/\\s\\+$//e')
 end, {})
+

nvim/keymaps.lua

@@ -15,7 +15,7 @@ vim.keymap.set('n', '<leader>s', ':call WindowSwap#EasyWindowSwap()<CR>', {})
 
 -- Convenience
 vim.keymap.set('n', '<leader>w', ':w<CR>', { silent = true })
-vim.keymap.set('n', '<leader>F', ':e.<CR>', {})
+vim.keymap.set('n', '<leader>F', ':NvimTreeToggle<CR>', { noremap = true, silent = true })
 vim.keymap.set('n', 'Y', 'y$', {})
 
 -- Telescope

nvim/plugins.lua

@@ -27,7 +27,7 @@ cmp.setup({
     ['<C-f>'] = cmp.mapping.scroll_docs(4),
     ['<C-Space>'] = cmp.mapping.complete(),
     ['<C-e>'] = cmp.mapping.abort(),
-    ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+    ['<Tab>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
   }),
 
   sources = cmp.config.sources({
@@ -97,7 +97,6 @@ lspconfig.dockerls.setup({ capabilities = capabilities })
 lspconfig.docker_compose_language_service.setup({ capabilities = capabilities })
 lspconfig.flow.setup({ capabilities = capabilities })
 lspconfig.marksman.setup({ capabilities = capabilities })
-lspconfig.als.setup({ capabilities = capabilities })
 lspconfig.sqls.setup({ capabilities = capabilities })
 lspconfig.yamlls.setup({ capabilities = capabilities })
 lspconfig.nil_ls.setup({ capabilities = capabilities })
@@ -188,3 +187,26 @@ require("copilot").setup({
   panel = { enabled = false },
 })
 require("copilot_cmp").setup()
+
+vim.g.bullets_enabled_file_types = {
+  'markdown',
+  'text',
+  'gitcommit',
+  'scratch'
+}
+
+
+require("nvim-tree").setup({
+  sort = {
+    sorter = "case_sensitive",
+  },
+  view = {
+    width = 30,
+  },
+  renderer = {
+    group_empty = true,
+  },
+  -- filters = {
+  --   dotfiles = true,
+  -- },
+})