git.nix

@@ -2,10 +2,11 @@
 {
   programs.git = {
     enable = true;
+    userName = "Leonora Tindall";
+    userEmail = "nora@nora.codes";
     lfs.enable = true;
-    settings = {
+    delta.enable = true;
-      user.name = "Leonora Tindall";
+    extraConfig = {
-      user.email = "nora@nora.codes";
       init.defaultBranch = "main";
       push.default = "current";
       color.ui = "auto";
@@ -43,10 +44,5 @@
     };
   };
 
-  programs.delta = {
-    enable = true;
-    enableGitIntegration = true;
-  };
-
   home.file.".gitignore".source = ./rcfiles/gitignore;
 }

npins/sources.json

@@ -9,9 +9,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "13a1beb7c9962e0d2ba35a4d5c87546509b89b7d",
+      "revision": "1fa73bb2cc39e250eb01e511ae6ac83bfbf9f38c",
-      "url": "https://github.com/nix-community/home-manager/archive/13a1beb7c9962e0d2ba35a4d5c87546509b89b7d.tar.gz",
+      "url": "https://github.com/nix-community/home-manager/archive/1fa73bb2cc39e250eb01e511ae6ac83bfbf9f38c.tar.gz",
-      "hash": "0c5b1cfhg0h2fxxjkczvzc6lmavqm0zvnmcqqw786rdr9ij8frax"
+      "hash": "06mz6f8b55x9hiyvbr8s77vmscyskqv00hv5zmcihdw5hhkrl8ls"
     },
     "nixgl": {
       "type": "Git",
@@ -22,15 +22,15 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "b6105297e6f0cd041670c3e8628394d4ee247ed5",
+      "revision": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
-      "url": "https://github.com/guibou/nixGL/archive/b6105297e6f0cd041670c3e8628394d4ee247ed5.tar.gz",
+      "url": "https://github.com/guibou/nixGL/archive/310f8e49a149e4c9ea52f1adf70cdc768ec53f8a.tar.gz",
-      "hash": "1zv3bshk0l4hfh1s7s3jzwjxl0nqqcvc4a3kydd3d4lgh7651d3x"
+      "hash": "1crnbv3mdx83xjwl2j63rwwl9qfgi2f1lr53zzjlby5lh50xjz4n"
     },
     "nixpkgs": {
       "type": "Channel",
       "name": "nixos-unstable",
-      "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre942779.d6c719321308/nixexprs.tar.xz",
+      "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre823481.3016b4b15d13/nixexprs.tar.xz",
-      "hash": "1lr296971vfbgqfcvf4qzx0cs85ry0s61cwsg8ksxbpskmvim0rh"
+      "hash": "1ml7yaq7r15rfpx9vqh32bisc2w7kdsv6kmclnb2g113fbv6fd85"
     }
   },
   "version": 5

ollama.nix

@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+{
+  services.ollama = {
+    enable = true;
+    acceleration = "rocm";
+    environmentVariables = {
+      HSA_OVERRIDE_GFX_VERSION = "10.3.0";
+    };
+  };
+}

python.nix

@@ -5,9 +5,13 @@
     (python3.withPackages (ps: with ps; [
       python-lsp-server
       python-lsp-jsonrpc
+      python-lsp-black
       python-lsp-ruff
-      jedi-language-server
+      pyls-isort
-      ruff
+      pyls-flake8
+      flake8
+      isort
+      black
     ]))
   ];
 }

rcfiles/neovim.lua

@@ -37,6 +37,7 @@ vim.keymap.set('n', '<leader>fh', tbuiltin.help_tags, {})
 vim.keymap.set('n', '<leader>fs', tbuiltin.spell_suggest, {})
 
 -- General LSP settings
+vim.lsp.enable('pylsp')
 
 -- LSP diagnostic signs
 vim.diagnostic.config({
@@ -61,36 +62,28 @@ vim.diagnostic.config({
     }
 })
 
-vim.keymap.set('n', '<leader><leader>d', '<cmd>lua vim.diagnostic.open_float()<CR>', 
+vim.keymap.set('n', '<leader><leader>d', '<cmd>lua vim.diagnostic.open_float()<CR>', { noremap = true, silent = true })
-  { noremap = true, silent = true })
-vim.keymap.set('n', '<leader><leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', 
-  { noremap = true, silent = true })
 
 vim.cmd([[
   set signcolumn=yes
   autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
 ]])
 
--- Python-specific lspconfig
+-- Rust tools for Rust-specific LSP
-vim.lsp.enable('pylsp')
+local rt = require("rust-tools")
-vim.lsp.enable('jedi_language_server')
+rt.setup({
-
+  server = {
-vim.lsp.config('ruff', {
+    on_attach = function(_, bufnr)
-  settings = {
+      -- ctrl + space for hover actions
-    ruff = {}
+      vim.keymap.set("n", "<C-space>", rt.hover_actions.hover_actions, { buffer = bufnr })
+      -- ,a for code actions
+      vim.keymap.set("n", "<Leader>a", rt.code_action_group.code_action_group, { buffer = bufnr })
+    end,
   }
 })
-vim.lsp.enable('ruff')
-
-vim.lsp.config('ty', {
-  settings = {
-    ty = {}
-  }
-})
-vim.lsp.enable('ty')
 
 -- set up treesitter
-require('nvim-treesitter').setup {
+require('nvim-treesitter.configs').setup {
   auto_install = false,
   ident = { enable = true }, 
   rainbow = {

ssh.nix

@@ -1,16 +1,9 @@
 { config, pkgs, ... }:
 {
   programs.ssh = {
-    # NOTE: if issues arise, check out this option; we may need to set some
-    # of the default options again, manually.
-    enableDefaultConfig = false;
     enable = true;
-    matchBlocks = {
+    addKeysToAgent = "yes";
-      "*" = {
+    forwardAgent = true;
-        addKeysToAgent = "yes";
-        forwardAgent = true;
-      };
-    };
   };
 
   services.ssh-agent.enable = true;

timberhearth.nix

@@ -16,6 +16,7 @@ in
       ./jj.nix
       ./jq.nix
       ./nix-utils.nix
+      ./ollama.nix
       ./pandoc.nix
       ./python.nix
       ./ssh.nix

vim.nix

@@ -4,12 +4,11 @@
     enable = true;
     viAlias = true;
     vimAlias = true;
-    withPython3 = true;
     defaultEditor = true;
     plugins = with pkgs.vimPlugins; [
       vim-nix
       rust-vim
-      rustaceanvim
+      rust-tools-nvim
       nvim-cmp
       snippets-nvim
       nvim-treesitter
@@ -17,21 +16,17 @@
       nvim-treesitter-parsers.lua
       nvim-treesitter-parsers.toml
       nvim-treesitter-parsers.python
+      jedi-vim
       nvim-lspconfig
       nvim-lsputils
       fzf-vim
-      vim-sleuth
+      sleuth
       whitespace-nvim # ,t to trim whitespace
       vimsence
       vim-wordy #:Wordy [kind], :NoWordy
       vim-pencil #:Pencil, :NoPencil
       telescope-nvim
-      plenary-nvim
     ];
-    extraPackages = with pkgs; [
+    extraLuaConfig = (builtins.readFile ./rcfiles/neovim.lua);
-      ruff
-      ty
-    ];
-    initLua = (builtins.readFile ./rcfiles/neovim.lua);
   };
 }