From 217403e3141a3d7a2d937a7234b75d0838e92335 Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Wed, 19 Apr 2023 18:52:59 -0400 Subject: [PATCH] fmt --- nix/home-manager/flake.nix | 40 +++++++++++-------- nix/home-manager/home.nix | 13 +++--- nix/home-manager/modules/environment.nix | 12 ++++-- nix/home-manager/modules/files.nix | 8 +++- nix/home-manager/modules/packages/default.nix | 33 ++++++++------- 5 files changed, 63 insertions(+), 43 deletions(-) diff --git a/nix/home-manager/flake.nix b/nix/home-manager/flake.nix index 71d4c8b..362b051 100644 --- a/nix/home-manager/flake.nix +++ b/nix/home-manager/flake.nix @@ -17,24 +17,30 @@ }; }; - outputs = { nixpkgs, home-manager, devenv, nix-index-database, ... }: - let - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - in { - homeConfigurations.acicchetti = home-manager.lib.homeManagerConfiguration { - inherit pkgs; + outputs = { + nixpkgs, + home-manager, + devenv, + nix-index-database, + ... + }: let + system = "x86_64-linux"; + pkgs = nixpkgs.legacyPackages.${system}; + in { + formatter."${system}" = nixpkgs.legacyPackages."${system}".alejandra; + homeConfigurations.acicchetti = home-manager.lib.homeManagerConfiguration { + inherit pkgs; - # Specify your home configuration modules here, for example, - # the path to your home.nix. - modules = [ - { home.packages = [devenv.packages."${system}".devenv]; } - nix-index-database.hmModules.nix-index - ./home.nix - ]; + # Specify your home configuration modules here, for example, + # the path to your home.nix. + modules = [ + {home.packages = [devenv.packages."${system}".devenv];} + nix-index-database.hmModules.nix-index + ./home.nix + ]; - # Optionally use extraSpecialArgs - # to pass through arguments to home.nix - }; + # Optionally use extraSpecialArgs + # to pass through arguments to home.nix }; + }; } diff --git a/nix/home-manager/home.nix b/nix/home-manager/home.nix index cd05df5..2d7ebf9 100644 --- a/nix/home-manager/home.nix +++ b/nix/home-manager/home.nix @@ -1,6 +1,8 @@ -{ config, pkgs, ... }: - { + config, + pkgs, + ... +}: { # Home Manager needs a bit of information about you and the paths it should # manage. home.username = "acicchetti"; @@ -18,7 +20,6 @@ # The home.packages option allows you to install Nix packages into your # environment. home.packages = [ - # # It is sometimes useful to fine-tune packages, for example, by applying # # overrides. You can do that directly here, just don't forget the # # parentheses. Maybe you want to install Nerd Fonts with a limited number of @@ -68,8 +69,8 @@ programs.nix-index.enable = true; imports = [ - ./modules/packages - ./modules/files.nix - ./modules/environment.nix + ./modules/packages + ./modules/files.nix + ./modules/environment.nix ]; } diff --git a/nix/home-manager/modules/environment.nix b/nix/home-manager/modules/environment.nix index a90391e..78f37ac 100644 --- a/nix/home-manager/modules/environment.nix +++ b/nix/home-manager/modules/environment.nix @@ -1,6 +1,10 @@ -{ pkgs, lib, config, ... }: { - home.sessionVariables = { - EDITOR="nvim"; - }; + pkgs, + lib, + config, + ... +}: { + home.sessionVariables = { + EDITOR = "nvim"; + }; } diff --git a/nix/home-manager/modules/files.nix b/nix/home-manager/modules/files.nix index 2028a1d..3bdcc49 100644 --- a/nix/home-manager/modules/files.nix +++ b/nix/home-manager/modules/files.nix @@ -1,4 +1,8 @@ -{pkgs, lib, config, ...}: { - home.file.".config/zellij/config.kdl".source = ../../../zellij/config.kdl; + pkgs, + lib, + config, + ... +}: { + home.file.".config/zellij/config.kdl".source = ../../../zellij/config.kdl; } diff --git a/nix/home-manager/modules/packages/default.nix b/nix/home-manager/modules/packages/default.nix index 0716b40..981dc77 100644 --- a/nix/home-manager/modules/packages/default.nix +++ b/nix/home-manager/modules/packages/default.nix @@ -1,15 +1,20 @@ -{ pkgs, lib, config, ...}: -{ home.packages = with pkgs; -[ - just - difftastic - git - zsh - erdtree - htop - ripgrep - zellij - neovim - bat -]; +{ + pkgs, + lib, + config, + ... +}: { + home.packages = with pkgs; [ + just + difftastic + git + zsh + erdtree + htop + ripgrep + zellij + neovim + bat + comma + ]; }