From 8734ba9ad9ab3a682cfd95509d9742a2cd7f4e0e Mon Sep 17 00:00:00 2001 From: Adam0 Date: Sun, 13 Sep 2026 21:53:00 +0200 Subject: [PATCH] Neovim stuff --- flake.lock | 95 ++++--------------- flake.nix | 10 +- modules/programs/gui/discord/default.nix | 8 +- .../tui/neovim/components/dashboard.nix | 4 + .../tui/neovim/components/debugger.nix | 3 - 5 files changed, 39 insertions(+), 81 deletions(-) delete mode 100644 modules/programs/tui/neovim/components/debugger.nix diff --git a/flake.lock b/flake.lock index 5593099..bda8df1 100644 --- a/flake.lock +++ b/flake.lock @@ -174,7 +174,7 @@ "pi-nix", "systems" ], - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix" }, "locked": { "lastModified": 1778446047, @@ -675,28 +675,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixcord", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1788642154, - "narHash": "sha256-sPpQFVaFTDqO/4vvCAhuAhqTgqN/ygu+9eJcs5eB0js=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "fd0956c99c41ae3c13a73a638f1f7e963aebc4ab", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-26.05", - "repo": "home-manager", - "type": "github" - } - }, "hylix": { "inputs": { "flake-parts": [ @@ -1343,11 +1321,17 @@ }, "nixcord": { "inputs": { - "home-manager": "home-manager_2", + "home-manager": [ + "home-manager" + ], "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_7", + "nixpkgs": [ + "nixpkgs" + ], "nixpkgs-nixcord": "nixpkgs-nixcord", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": [ + "treefmt-nix" + ] }, "locked": { "lastModified": 1789204800, @@ -1552,31 +1536,15 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1788921488, - "narHash": "sha256-8+xWRxEkD6l217cIUdRxfeUGS9lQX0hVtUuNVsBaDzk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6aefcda9401be8acc2b74244fb3b37520ea1f0a8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-26.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1789073787, - "narHash": "sha256-vLblJRFZjrSBOyHD4jwBkGJm2iOVk8c9BJnzZTOojSc=", - "rev": "aff8a0b28396750446e5537a96461bc4facdb287", + "lastModified": 1789264731, + "narHash": "sha256-iR1Jj6svMpvLxPWA40qp+WUpg3MStLXJy5TZrP2cPes=", + "rev": "02f5696b0e6097e589076d886b317b83ff0437d7", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1071116.aff8a0b28396/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1072974.02f5696b0e60/nixexprs.tar.zst" }, "original": { "type": "tarball", - "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" } }, "noctalia-plugins": { @@ -1637,11 +1605,11 @@ ] }, "locked": { - "lastModified": 1789212173, - "narHash": "sha256-UwodfirSIorODTFjucbaB7esq3GvoQCIC2Egr+qXQf8=", + "lastModified": 1789331121, + "narHash": "sha256-SvPqxf7zAHsWPt2yMKHkwyTy6LHDI6fxy8uYjG7I7nQ=", "owner": "adam01110", "repo": "nvf", - "rev": "1e1e57601e86867c5b4fc5eb96a014319c769cae", + "rev": "db759bc111776273f62fbadca9cb3077f99b38e7", "type": "github" }, "original": { @@ -1869,7 +1837,7 @@ "nix-index-database": "nix-index-database", "nix-userstyles": "nix-userstyles", "nixcord": "nixcord", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "nixpkgs-crowdsec": "nixpkgs-crowdsec", "nixpkgs-crowdsec-blocklist-import": "nixpkgs-crowdsec-blocklist-import", "noctalia-plugins": "noctalia-plugins", @@ -1881,7 +1849,7 @@ "sops-nix": "sops-nix", "spicetify-nix": "spicetify-nix", "stylix": "stylix", - "treefmt-nix": "treefmt-nix_3", + "treefmt-nix": "treefmt-nix_2", "tuigreet": "tuigreet", "zen-browser": "zen-browser" } @@ -2142,27 +2110,6 @@ } }, "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixcord", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1786901030, - "narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { "inputs": { "nixpkgs": [ "pi-nix", @@ -2184,7 +2131,7 @@ "type": "github" } }, - "treefmt-nix_3": { + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index 010bbf4..7ecc59a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,4 +1,4 @@ -# DO-NOT-EDIT. This file was auto-generated using github:vic/flake-file. +# DO-NOT-EDIT. This file was auto-generated using github:denful/flake-file. # Use `nix run .#write-flake` to regenerate it. { outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules); @@ -62,9 +62,13 @@ }; nixcord = { url = "github:kaylorben/nixcord"; - inputs.flake-parts.follows = "flake-parts"; + inputs = { + home-manager.follows = "home-manager"; + nixpkgs.follows = "nixpkgs"; + treefmt-nix.follows = "treefmt-nix"; + }; }; - nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"; + nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst"; nixpkgs-crowdsec.url = "github:TornaxO7/nixpkgs/saltsprint"; nixpkgs-crowdsec-blocklist-import.url = "github:gaelj/nixpkgs/init-crowdsec-blocklist-import"; noctalia-plugins = { diff --git a/modules/programs/gui/discord/default.nix b/modules/programs/gui/discord/default.nix index 9f86baa..d0ca150 100644 --- a/modules/programs/gui/discord/default.nix +++ b/modules/programs/gui/discord/default.nix @@ -1,7 +1,13 @@ {inputs, ...}: { flake-file.inputs.nixcord = { url = "github:kaylorben/nixcord"; - inputs.flake-parts.follows = "flake-parts"; + inputs = { + # keep-sorted start + home-manager.follows = "home-manager"; + nixpkgs.follows = "nixpkgs"; + treefmt-nix.follows = "treefmt-nix"; + # keep-sorted end + }; }; flake.modules.homeManager.discord = { diff --git a/modules/programs/tui/neovim/components/dashboard.nix b/modules/programs/tui/neovim/components/dashboard.nix index 971d8e1..0a1af79 100644 --- a/modules/programs/tui/neovim/components/dashboard.nix +++ b/modules/programs/tui/neovim/components/dashboard.nix @@ -308,6 +308,9 @@ height = 6; padding = 1; indent = 3; + # Avoid showing stale terminal cache before live status arrives. + random = 1; + ttl = 0; } { pane = 2; @@ -319,6 +322,7 @@ } ]; }; + }; # keep-sorted end }; diff --git a/modules/programs/tui/neovim/components/debugger.nix b/modules/programs/tui/neovim/components/debugger.nix deleted file mode 100644 index c53d2f6..0000000 --- a/modules/programs/tui/neovim/components/debugger.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - flake.modules.homeManager.neovim.programs.nvf.settings.vim.debugger.nvim-dap.ui.enable = true; -} -- 2.51.2