From 3d1fcd26269f00aeb3de137bd0f12e67c88f46b8 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Fri, 8 Aug 2025 15:21:55 -0500 Subject: [PATCH] final cleanup for nixvim -> nvf + formatting --- flake.nix | 234 ++++++++++++++++++++-------------------- home/common/default.nix | 13 ++- 2 files changed, 129 insertions(+), 118 deletions(-) diff --git a/flake.nix b/flake.nix index 4a41b6c..7c296d4 100644 --- a/flake.nix +++ b/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 - , home-manager, catppuccin, colmena, ... }: - let - inherit (self) outputs; - lib = nixpkgs.lib // home-manager.lib; - in { - inherit lib; - nixpkgs.config.allowUnfree = true; - config.allowUnfree = true; - nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ "widevine-cdm" ]; - colmena = { - meta = { - nixpkgs = import nixpkgs { system = "x86_64-linux"; }; - 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; - # }; - # }; + outputs = inputs @ { + self, + nixpkgs, + nix, + nixpkgs-stable, + nixos-hardware, + home-manager, + catppuccin, + colmena, + ... + }: let + inherit (self) outputs; + lib = nixpkgs.lib // home-manager.lib; + in { + inherit lib; + nixpkgs.config.allowUnfree = true; + config.allowUnfree = true; + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) ["widevine-cdm"]; + colmena = { + meta = { + nixpkgs = import nixpkgs {system = "x86_64-linux";}; + 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; + # }; + # }; + }; + }; } diff --git a/home/common/default.nix b/home/common/default.nix index e27f272..b477465 100644 --- a/home/common/default.nix +++ b/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 = - "id_aur id_dsa id_ed25519 git C7E41C9F79C846984163693FCCD8E76F07EA701B"; + keys = "id_aur id_dsa id_ed25519 git C7E41C9F79C846984163693FCCD8E76F07EA701B"; }; home.file.".links/links.cfg".source = files/links.cfg; }