final cleanup for nixvim -> nvf + formatting

This commit is contained in:
Don Harper 2025-08-08 15:21:55 -05:00
parent f3eb385fd2
commit 3d1fcd2626
2 changed files with 129 additions and 118 deletions

View file

@ -17,13 +17,19 @@
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nvf.url = "github:notashelf/nvf"; nvf.url = "github:notashelf/nvf";
nvf.inputs.nixpkgs.follows = "nixpkgs"; nvf.inputs.nixpkgs.follows = "nixpkgs";
# nixvim.url = "github:nix-community/nixvim";
# nixvim.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs@{ self, nixpkgs, nix, nixpkgs-stable, nixos-hardware outputs = inputs @ {
, home-manager, catppuccin, colmena, ... }: self,
let nixpkgs,
nix,
nixpkgs-stable,
nixos-hardware,
home-manager,
catppuccin,
colmena,
...
}: let
inherit (self) outputs; inherit (self) outputs;
lib = nixpkgs.lib // home-manager.lib; lib = nixpkgs.lib // home-manager.lib;
in { in {

View file

@ -1,4 +1,11 @@
{ config, pkgs, inputs, osConfig, outputs, ... }: { {
config,
pkgs,
inputs,
osConfig,
outputs,
...
}: {
imports = [ imports = [
./aerc.nix ./aerc.nix
./bash.nix ./bash.nix
@ -15,7 +22,6 @@
./naviterm.nix ./naviterm.nix
./newsboat.nix ./newsboat.nix
./nvf.nix ./nvf.nix
# ./nixvim.nix
./ssh.nix ./ssh.nix
./taskwarrior.nix ./taskwarrior.nix
./topgrade.nix ./topgrade.nix
@ -115,8 +121,7 @@
programs.keychain = { programs.keychain = {
enable = true; enable = true;
enableBashIntegration = true; enableBashIntegration = true;
keys = keys = "id_aur id_dsa id_ed25519 git C7E41C9F79C846984163693FCCD8E76F07EA701B";
"id_aur id_dsa id_ed25519 git C7E41C9F79C846984163693FCCD8E76F07EA701B";
}; };
home.file.".links/links.cfg".source = files/links.cfg; home.file.".links/links.cfg".source = files/links.cfg;
} }