final cleanup for nixvim -> nvf + formatting

flake.nix

@@ -17,122 +17,128 @@
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     nvf.url = "github:notashelf/nvf";
     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,
-      inherit (self) outputs;
+    nix,
-      lib = nixpkgs.lib // home-manager.lib;
+    nixpkgs-stable,
-    in {
+    nixos-hardware,
-      inherit lib;
+    home-manager,
-      nixpkgs.config.allowUnfree = true;
+    catppuccin,
-      config.allowUnfree = true;
+    colmena,
-      nixpkgs.config.allowUnfreePredicate = pkg:
+    ...
-        builtins.elem (lib.getName pkg) [ "widevine-cdm" ];
+  }: let
-      colmena = {
+    inherit (self) outputs;
-        meta = {
+    lib = nixpkgs.lib // home-manager.lib;
-          nixpkgs = import nixpkgs { system = "x86_64-linux"; };
+  in {
-          specialArgs = { inherit inputs outputs; };
+    inherit lib;
-        };
+    nixpkgs.config.allowUnfree = true;
-        # ace = import ./hosts/ace/colmena.nix;          # Acer C720
+    config.allowUnfree = true;
-        book = import ./hosts/book/colmena.nix; # Google Pixelbook 2017 w/ nvme.
+    nixpkgs.config.allowUnfreePredicate = pkg:
-        display = import ./hosts/display/colmena.nix; # Pi4
+      builtins.elem (lib.getName pkg) ["widevine-cdm"];
-        # eve = import ./hosts/eve/colmena.nix; # Google Pixelbook 2017 w/ eMMC.
+    colmena = {
-        fred = import ./hosts/fred/colmena.nix; # acer server
+      meta = {
-        loki = import ./hosts/loki/colmena.nix; # Dell XPS 13
+        nixpkgs = import nixpkgs {system = "x86_64-linux";};
-        # pi1 = import ./hosts/pi1/colmena.nix;
+        specialArgs = {inherit inputs outputs;};
-        # pocket2 = import ./hosts/pocket2/colmena.nix;
-        smaug = import ./hosts/smaug/colmena.nix; # Thinkpad x260
-        w1 = import ./hosts/w1/colmena.nix; # Hetzner VPS
-        # w2 = import ./hosts/w2/colmena.nix;
-      };
-
-      nixosConfigurations = {
-        # clients
-        ace = lib.nixosSystem {
-          modules = [ ./hosts/ace ];
-          specialArgs = { inherit inputs outputs; };
-        };
-        dragon = lib.nixosSystem {
-          modules = [ ./hosts/dragon ];
-          specialArgs = { inherit inputs outputs; };
-        };
-        eve = lib.nixosSystem {
-          modules = [ ./hosts/eve ];
-          specialArgs = { inherit inputs outputs; };
-        };
-        loki = lib.nixosSystem {
-          modules = [ ./hosts/loki ];
-          specialArgs = { inherit inputs outputs; };
-        };
-
-        pocket2 = lib.nixosSystem {
-          modules = [ ./hosts/pocket2 ];
-          specialArgs = { inherit inputs outputs; };
-        };
-        smaug = lib.nixosSystem {
-          modules = [ ./hosts/smaug ];
-          specialArgs = { inherit inputs outputs; };
-        };
-        t2 = lib.nixosSystem {
-          modules = [ ./hosts/t2 ];
-          specialArgs = { inherit inputs outputs; };
-        };
-        pi1 = lib.nixosSystem {
-          modules = [ ./hosts/pi1 ];
-          specialArgs = { inherit inputs outputs; };
-        };
-
-        # servers
-        display = lib.nixosSystem {
-          modules = [ ./hosts/display ];
-          specialArgs = { inherit inputs outputs; };
-        };
-        fred = lib.nixosSystem {
-          modules = [ ./hosts/fred ];
-          specialArgs = { inherit inputs outputs; };
-        };
-        vm = lib.nixosSystem {
-          modules = [
-            "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix"
-            "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
-            ./hosts/vm
-          ];
-          specialArgs = { inherit inputs outputs; };
-        };
-        harper2 = lib.nixosSystem {
-          modules = [ ./hosts/harper2 ];
-          specialArgs = { inherit inputs outputs; };
-        };
-        harper = lib.nixosSystem {
-          modules = [ ./hosts/harper ];
-          specialArgs = { inherit inputs outputs; };
-        };
-        nuwww = lib.nixosSystem {
-          modules = [ ./hosts/nuwww ];
-          specialArgs = { inherit inputs outputs; };
-        };
-        pihole = lib.nixosSystem {
-          modules = [ ./hosts/pihole ];
-          specialArgs = { inherit inputs outputs; };
-        };
-        www2 = lib.nixosSystem {
-          modules = [ ./hosts/www2 ];
-          specialArgs = { inherit inputs outputs; };
-        };
-        w1 = lib.nixosSystem {
-          modules = [ ./hosts/w1 ];
-          specialArgs = { inherit inputs outputs; };
-        };
-        # w2 = lib.nixosSystem {
-        #   modules = [./hosts/w2];
-        #   specialArgs = {
-        #     inherit inputs outputs;
-        #   };
-        # };
       };
+      # ace = import ./hosts/ace/colmena.nix;          # Acer C720
+      book = import ./hosts/book/colmena.nix; # Google Pixelbook 2017 w/ nvme.
+      display = import ./hosts/display/colmena.nix; # Pi4
+      # eve = import ./hosts/eve/colmena.nix; # Google Pixelbook 2017 w/ eMMC.
+      fred = import ./hosts/fred/colmena.nix; # acer server
+      loki = import ./hosts/loki/colmena.nix; # Dell XPS 13
+      # pi1 = import ./hosts/pi1/colmena.nix;
+      # pocket2 = import ./hosts/pocket2/colmena.nix;
+      smaug = import ./hosts/smaug/colmena.nix; # Thinkpad x260
+      w1 = import ./hosts/w1/colmena.nix; # Hetzner VPS
+      # w2 = import ./hosts/w2/colmena.nix;
     };
+
+    nixosConfigurations = {
+      # clients
+      ace = lib.nixosSystem {
+        modules = [./hosts/ace];
+        specialArgs = {inherit inputs outputs;};
+      };
+      dragon = lib.nixosSystem {
+        modules = [./hosts/dragon];
+        specialArgs = {inherit inputs outputs;};
+      };
+      eve = lib.nixosSystem {
+        modules = [./hosts/eve];
+        specialArgs = {inherit inputs outputs;};
+      };
+      loki = lib.nixosSystem {
+        modules = [./hosts/loki];
+        specialArgs = {inherit inputs outputs;};
+      };
+
+      pocket2 = lib.nixosSystem {
+        modules = [./hosts/pocket2];
+        specialArgs = {inherit inputs outputs;};
+      };
+      smaug = lib.nixosSystem {
+        modules = [./hosts/smaug];
+        specialArgs = {inherit inputs outputs;};
+      };
+      t2 = lib.nixosSystem {
+        modules = [./hosts/t2];
+        specialArgs = {inherit inputs outputs;};
+      };
+      pi1 = lib.nixosSystem {
+        modules = [./hosts/pi1];
+        specialArgs = {inherit inputs outputs;};
+      };
+
+      # servers
+      display = lib.nixosSystem {
+        modules = [./hosts/display];
+        specialArgs = {inherit inputs outputs;};
+      };
+      fred = lib.nixosSystem {
+        modules = [./hosts/fred];
+        specialArgs = {inherit inputs outputs;};
+      };
+      vm = lib.nixosSystem {
+        modules = [
+          "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix"
+          "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
+          ./hosts/vm
+        ];
+        specialArgs = {inherit inputs outputs;};
+      };
+      harper2 = lib.nixosSystem {
+        modules = [./hosts/harper2];
+        specialArgs = {inherit inputs outputs;};
+      };
+      harper = lib.nixosSystem {
+        modules = [./hosts/harper];
+        specialArgs = {inherit inputs outputs;};
+      };
+      nuwww = lib.nixosSystem {
+        modules = [./hosts/nuwww];
+        specialArgs = {inherit inputs outputs;};
+      };
+      pihole = lib.nixosSystem {
+        modules = [./hosts/pihole];
+        specialArgs = {inherit inputs outputs;};
+      };
+      www2 = lib.nixosSystem {
+        modules = [./hosts/www2];
+        specialArgs = {inherit inputs outputs;};
+      };
+      w1 = lib.nixosSystem {
+        modules = [./hosts/w1];
+        specialArgs = {inherit inputs outputs;};
+      };
+      # w2 = lib.nixosSystem {
+      #   modules = [./hosts/w2];
+      #   specialArgs = {
+      #     inherit inputs outputs;
+      #   };
+      # };
+    };
+  };
 }

home/common/default.nix

@@ -1,4 +1,11 @@
-{ config, pkgs, inputs, osConfig, outputs, ... }: {
+{
+  config,
+  pkgs,
+  inputs,
+  osConfig,
+  outputs,
+  ...
+}: {
   imports = [
     ./aerc.nix
     ./bash.nix
@@ -15,7 +22,6 @@
     ./naviterm.nix
     ./newsboat.nix
     ./nvf.nix
-    # ./nixvim.nix
     ./ssh.nix
     ./taskwarrior.nix
     ./topgrade.nix
@@ -115,8 +121,7 @@
   programs.keychain = {
     enable = 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;
 }