Update to newer version of pins

This commit is contained in:
Leonora Tindall 2026-02-09 08:34:49 -06:00
parent aac9f3cdff
commit 3ae55c39b6
5 changed files with 32 additions and 29 deletions

12
git.nix
View File

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

View File

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

View File

@ -75,21 +75,11 @@ vim.cmd([[
vim.lsp.enable('pylsp') vim.lsp.enable('pylsp')
vim.lsp.enable('jedi_language_server') vim.lsp.enable('jedi_language_server')
-- Rust tools for Rust-specific LSP
local rt = require("rust-tools")
rt.setup({
server = {
on_attach = function(_, bufnr)
-- ctrl + space for hover actions
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,
} }
}) })
-- set up treesitter -- set up treesitter
require('nvim-treesitter.configs').setup { require('nvim-treesitter').setup {
auto_install = false, auto_install = false,
ident = { enable = true }, ident = { enable = true },
rainbow = { rainbow = {

11
ssh.nix
View File

@ -1,9 +1,16 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
programs.ssh = { 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; enable = true;
addKeysToAgent = "yes"; matchBlocks = {
forwardAgent = true; "*" = {
addKeysToAgent = "yes";
forwardAgent = true;
};
};
}; };
services.ssh-agent.enable = true; services.ssh-agent.enable = true;

View File

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