From adc35c5926cad8a52332efb0ce1d725ebe09c5c4 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Thu, 20 Feb 2025 16:37:48 +0100 Subject: [PATCH] Update stuff + add work dir to impermanence --- flake.lock | 60 ++++++++++++++++---------------- modules/cli/nix/impermanence.nix | 1 + nvim/default.nix | 18 ++++++---- 3 files changed, 43 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index acbafb3..2c85601 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1739380580, - "narHash": "sha256-wGtGEfdooudj74wn59Vu5Z2DLsrX9cxdGTFc9sJrP9M=", + "lastModified": 1739969582, + "narHash": "sha256-ni6tM12mzArohqzvscZn/N52GHiXZsskN6yMYzo25XI=", "owner": "aylur", "repo": "astal", - "rev": "956b74fd9ff8c607b6683b404860c4e6b30ffe2b", + "rev": "a0de1526d2de8a02feec1cba4086f284ec9f6098", "type": "github" }, "original": { @@ -174,11 +174,11 @@ "zig2nix": "zig2nix" }, "locked": { - "lastModified": 1739723979, - "narHash": "sha256-EDyRAD8jA5aBX2WZiP89YjNycnXk+S0EilVbWc7M10g=", + "lastModified": 1739918167, + "narHash": "sha256-6zdYjNKqMTKfHKlaz0kKqqSmoSCqEjv1vyIygqi3wCo=", "owner": "mitchellh", "repo": "ghostty", - "rev": "2e7ed98dfd522f5050bfeba2bbe41b41ca696537", + "rev": "38908e01268298ced33b7b6835e49b8c6d437e12", "type": "github" }, "original": { @@ -261,11 +261,11 @@ ] }, "locked": { - "lastModified": 1739735703, - "narHash": "sha256-Z8QnPJO21TG8KqbPPX3kidT7cZwvM+86fhxmYUI1rps=", + "lastModified": 1740060750, + "narHash": "sha256-FOC9OzJ5Ckh6VjzGSRh4F3UCUOdM8NrzQT19PQcQJ44=", "owner": "nix-community", "repo": "home-manager", - "rev": "e5bc9c2af1dca75271aeaeb39035ce7a6125c395", + "rev": "0c0b0ac8af6ca76b1fcb514483a9bd73c18f1e8c", "type": "github" }, "original": { @@ -319,11 +319,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739664646, - "narHash": "sha256-RQZ8LBTsBkorO6uKILjO28i5I2GdyEU0fe3HAS5rrB0=", + "lastModified": 1740034565, + "narHash": "sha256-fuTCAi//E0WVGNjLk+9juJMfVmCMZXy66hOpXAbZX90=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "84b1159a837463590e8a057a90fefa6225b8679c", + "rev": "a56e9f2bfce06729a418081fda1dfa1c0dd18f81", "type": "github" }, "original": { @@ -335,11 +335,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1739640348, - "narHash": "sha256-QJ+5C6/6SncQkx+Q/IEKeAqxbRqf5ihEQIBwEwggcrI=", + "lastModified": 1739988796, + "narHash": "sha256-oldU5hcEGlMLknn/q0NFFnAUWfPYeJHRTlJtrLjpQQg=", "owner": "neovim", "repo": "neovim", - "rev": "a49f95d887a2425f11cb4a9b38f7b0039e4d837f", + "rev": "b0bbe25c4808158e8c806959e4d185244073647a", "type": "github" }, "original": { @@ -355,11 +355,11 @@ ] }, "locked": { - "lastModified": 1739548217, - "narHash": "sha256-rlv64erpr36xdmMDPgf9rhRXBYZ0BZb5nrw2ZPSk1sQ=", + "lastModified": 1739933872, + "narHash": "sha256-UhuvTR4OrWR+WBaRCZm4YMkvjJhZ1KZo/jRjE41m+Ek=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "678b22642abde2ee77ae2218ab41d802f010e5b0", + "rev": "6ab392f626a19f1122d1955c401286e1b7cf6b53", "type": "github" }, "original": { @@ -390,11 +390,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738816619, - "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", + "lastModified": 1739798439, + "narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", + "rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371", "type": "github" }, "original": { @@ -412,11 +412,11 @@ ] }, "locked": { - "lastModified": 1739718817, - "narHash": "sha256-J3tgc57E41sEVHQtQeCPNAh62NDnZrJCkSlaAj2gYs8=", + "lastModified": 1740046902, + "narHash": "sha256-Xbhz8eEqBmNpvqaGFbF5JopmfNJccWUr8eExtU/iGX4=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "c084e05fff6b2601de351e1bbee00485bf003f35", + "rev": "c4f6ae89468939d9fcf1a317c062cf5dd02004ea", "type": "github" }, "original": { @@ -427,11 +427,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739580444, - "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bb37161a0488b89830168b81c48aed11569cb93", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { @@ -499,11 +499,11 @@ ] }, "locked": { - "lastModified": 1738953846, - "narHash": "sha256-yrK3Hjcr8F7qS/j2F+r7C7o010eVWWlm4T1PrbKBOxQ=", + "lastModified": 1739829690, + "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4f09b473c936d41582dd744e19f34ec27592c5fd", + "rev": "3d0579f5cc93436052d94b73925b48973a104204", "type": "github" }, "original": { diff --git a/modules/cli/nix/impermanence.nix b/modules/cli/nix/impermanence.nix index 700e6f9..39dd919 100644 --- a/modules/cli/nix/impermanence.nix +++ b/modules/cli/nix/impermanence.nix @@ -43,6 +43,7 @@ "downloads" "stuff" "projects" + "work" { directory = ".gnupg"; mode = "0700"; diff --git a/nvim/default.nix b/nvim/default.nix index 76fdb03..eb22b3f 100644 --- a/nvim/default.nix +++ b/nvim/default.nix @@ -9,10 +9,12 @@ mkNvim = import ./nix/mknvim.nix {inherit pkgs lib;}; mkPlugin = src: pname: - pkgs.vimUtils.buildVimPlugin { - inherit pname src; - version = src.lastModifiedDate; - }; + (pkgs.vimUtils.buildVimPlugin + { + inherit pname src; + version = src.lastModifiedDate; + }) + .overrideAttrs {doCheck = false;}; in mkNvim { withNodeJs = false; @@ -64,10 +66,13 @@ in ts-comments-nvim nvim-lspconfig - blink-cmp + (blink-cmp.overrideAttrs { + # clashes with oil + postPatch = "rm doc/recipes.md"; + }) SchemaStore-nvim roslyn-nvim - ((mkPlugin ltex-extra "ltex-extra").overrideAttrs {doCheck = false;}) + (mkPlugin ltex-extra "ltex-extra") nvim-lint (conform-nvim.overrideAttrs { # clashes with oil @@ -111,6 +116,7 @@ in ]; opt = [ telescope-nvim + # (mkPlugin telescope "telescope.nvim") vim-illuminate nvim-treesitter-textobjects ];