add nix fmt

This commit is contained in:
uf5 2023-05-03 23:07:03 +05:00
parent 691c6579c7
commit bfb9d8e17f
8 changed files with 46 additions and 34 deletions

View file

@ -1,5 +1,6 @@
{ {
description = "NixOS + standalone home-manager config flakes to get you started!"; description =
"NixOS + standalone home-manager config flakes to get you started!";
outputs = inputs: { outputs = inputs: {
templates = { templates = {
minimal = { minimal = {

View file

@ -33,12 +33,16 @@
# Available through 'home-manager --flake .#your-username@your-hostname' # Available through 'home-manager --flake .#your-username@your-hostname'
homeConfigurations = { homeConfigurations = {
# FIXME replace with your username@hostname # FIXME replace with your username@hostname
"your-username@your-hostname" = home-manager.lib.homeManagerConfiguration { "your-username@your-hostname" =
pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance home-manager.lib.homeManagerConfiguration {
extraSpecialArgs = { inherit inputs; }; # Pass flake inputs to our config pkgs =
# > Our main home-manager configuration file < nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
modules = [ ./home-manager/home.nix ]; extraSpecialArgs = {
}; inherit inputs;
}; # Pass flake inputs to our config
# > Our main home-manager configuration file <
modules = [ ./home-manager/home.nix ];
};
}; };
}; };
} }

View file

@ -42,7 +42,8 @@
# This will additionally add your inputs to the system's legacy channels # This will additionally add your inputs to the system's legacy channels
# Making legacy nix commands consistent as well, awesome! # Making legacy nix commands consistent as well, awesome!
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}")
config.nix.registry;
settings = { settings = {
# Enable flakes and new 'nix' command # Enable flakes and new 'nix' command

View file

@ -31,20 +31,21 @@
"aarch64-darwin" "aarch64-darwin"
"x86_64-darwin" "x86_64-darwin"
]; ];
in in rec {
rec {
# Your custom packages # Your custom packages
# Acessible through 'nix build', 'nix shell', etc # Acessible through 'nix build', 'nix shell', etc
packages = forAllSystems (system: packages = forAllSystems (system:
let pkgs = nixpkgs.legacyPackages.${system}; let pkgs = nixpkgs.legacyPackages.${system};
in import ./pkgs { inherit pkgs; } in import ./pkgs { inherit pkgs; });
);
# Devshell for bootstrapping # Devshell for bootstrapping
# Acessible through 'nix develop' or 'nix-shell' (legacy) # Acessible through 'nix develop' or 'nix-shell' (legacy)
devShells = forAllSystems (system: devShells = forAllSystems (system:
let pkgs = nixpkgs.legacyPackages.${system}; let pkgs = nixpkgs.legacyPackages.${system};
in import ./shell.nix { inherit pkgs; } in import ./shell.nix { inherit pkgs; });
);
formatter = forAllSystems (system:
let pkgs = nixpkgs.legacyPackages.${system};
in pkgs.nixpkgs-fmt);
# Your custom packages and modifications, exported as overlays # Your custom packages and modifications, exported as overlays
overlays = import ./overlays { inherit inputs; }; overlays = import ./overlays { inherit inputs; };
@ -72,14 +73,16 @@
# Available through 'home-manager --flake .#your-username@your-hostname' # Available through 'home-manager --flake .#your-username@your-hostname'
homeConfigurations = { homeConfigurations = {
# FIXME replace with your username@hostname # FIXME replace with your username@hostname
"your-username@your-hostname" = home-manager.lib.homeManagerConfiguration { "your-username@your-hostname" =
pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance home-manager.lib.homeManagerConfiguration {
extraSpecialArgs = { inherit inputs outputs; }; pkgs =
modules = [ nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
# > Our main home-manager configuration file < extraSpecialArgs = { inherit inputs outputs; };
./home-manager/home.nix modules = [
]; # > Our main home-manager configuration file <
}; ./home-manager/home.nix
];
};
}; };
}; };
} }

View file

@ -50,7 +50,8 @@
# This will additionally add your inputs to the system's legacy channels # This will additionally add your inputs to the system's legacy channels
# Making legacy nix commands consistent as well, awesome! # Making legacy nix commands consistent as well, awesome!
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}")
config.nix.registry;
settings = { settings = {
# Enable flakes and new 'nix' command # Enable flakes and new 'nix' command

View file

@ -1,8 +1,9 @@
# A nixpkgs instance that is grabbed from the pinned nixpkgs commit in the lock file # A nixpkgs instance that is grabbed from the pinned nixpkgs commit in the lock file
# This is useful to avoid using channels when using legacy nix commands # This is useful to avoid using channels when using legacy nix commands
let lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked; let
in lock =
import (fetchTarball { (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked;
in import (fetchTarball {
url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz"; url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz";
sha256 = lock.narHash; sha256 = lock.narHash;
}) })

View file

@ -1,17 +1,17 @@
# This file defines overlays # This file defines overlays
{ inputs, ... }: { inputs, ... }: {
{
# This one brings our custom packages from the 'pkgs' directory # This one brings our custom packages from the 'pkgs' directory
additions = final: _prev: import ../pkgs { pkgs = final; }; additions = final: _prev: import ../pkgs { pkgs = final; };
# This one contains whatever you want to overlay # This one contains whatever you want to overlay
# You can change versions, add patches, set compilation flags, anything really. # You can change versions, add patches, set compilation flags, anything really.
# https://nixos.wiki/wiki/Overlays # https://nixos.wiki/wiki/Overlays
modifications = final: prev: { modifications = final: prev:
# example = prev.example.overrideAttrs (oldAttrs: rec { {
# ... # example = prev.example.overrideAttrs (oldAttrs: rec {
# }); # ...
}; # });
};
# When applied, the unstable nixpkgs set (declared in the flake inputs) will # When applied, the unstable nixpkgs set (declared in the flake inputs) will
# be accessible through 'pkgs.unstable' # be accessible through 'pkgs.unstable'

View file

@ -1,6 +1,7 @@
# Custom packages, that can be defined similarly to ones from nixpkgs # Custom packages, that can be defined similarly to ones from nixpkgs
# You can build them using 'nix build .#example' or (legacy) 'nix-build -A example' # You can build them using 'nix build .#example' or (legacy) 'nix-build -A example'
{ pkgs ? (import ../nixpkgs.nix) { } }: { { pkgs ? (import ../nixpkgs.nix) { } }:
{
# example = pkgs.callPackage ./example { }; # example = pkgs.callPackage ./example { };
} }