treewide: Switch from alejandra to nixpkgs-fmt

Neither nixfmt nor alejandra support the "standard" way to syntax
highlight multi-line strings in Nix, so nixpkgs-fmt is the only viable
solution.
This commit is contained in:
Donovan Glover 2023-06-11 09:33:54 -04:00
parent 09f2ce62de
commit 43a07cc8d9
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
35 changed files with 247 additions and 230 deletions

View File

@ -1,6 +1,7 @@
let let
VARIABLES = import ../src/variables.nix; VARIABLES = import ../src/variables.nix;
in { in
{
containers.rar = { containers.rar = {
privateNetwork = true; privateNetwork = true;
@ -11,10 +12,10 @@ in {
}; };
}; };
config = { config =
pkgs, { pkgs
lib, , lib
... , ...
}: { }: {
programs = { programs = {
fish.enable = true; fish.enable = true;

View File

@ -1,7 +1,9 @@
{config, ...}: let { config, ... }:
let
VARIABLES = import ../src/variables.nix; VARIABLES = import ../src/variables.nix;
hostCfg = config; hostCfg = config;
in { in
{
containers.wine = { containers.wine = {
privateNetwork = true; privateNetwork = true;
@ -23,10 +25,10 @@ in {
}; };
}; };
config = { config =
pkgs, { pkgs
lib, , lib
... , ...
}: { }: {
programs = { programs = {
fish.enable = true; fish.enable = true;

View File

@ -1,16 +1,18 @@
{ {
outputs = { outputs =
self, { self
nixpkgs, , nixpkgs
home-manager, , home-manager
hyprland, , hyprland
stylix, , stylix
nix-gaming, , nix-gaming
crystal-flake, , crystal-flake
... , ...
} @ attrs: let } @ attrs:
let
VARIABLES = import ./src/variables.nix; VARIABLES = import ./src/variables.nix;
in { in
{
formatter."${VARIABLES.system}" = nixpkgs.legacyPackages."${VARIABLES.system}".alejandra; formatter."${VARIABLES.system}" = nixpkgs.legacyPackages."${VARIABLES.system}".alejandra;
nixosConfigurations."${VARIABLES.hostname}" = nixpkgs.lib.nixosSystem { nixosConfigurations."${VARIABLES.hostname}" = nixpkgs.lib.nixosSystem {

View File

@ -1,8 +1,7 @@
{ { config
config, , lib
lib, , modulesPath
modulesPath, , ...
...
}: { }: {
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")

View File

@ -1,6 +1,8 @@
{pkgs, ...}: let { pkgs, ... }:
let
VARIABLES = import ../../src/variables.nix; VARIABLES = import ../../src/variables.nix;
in { in
{
users.defaultUserShell = pkgs.fish; users.defaultUserShell = pkgs.fish;
environment.shells = [ pkgs.fish ]; environment.shells = [ pkgs.fish ];

View File

@ -1,6 +1,8 @@
{pkgs, ...}: let { pkgs, ... }:
let
VARIABLES = import ../../src/variables.nix; VARIABLES = import ../../src/variables.nix;
in { in
{
environment.systemPackages = with pkgs; [ tig git ]; environment.systemPackages = with pkgs; [ tig git ];
home-manager.sharedModules = [ home-manager.sharedModules = [

View File

@ -1,6 +1,8 @@
{pkgs, ...}: let { pkgs, ... }:
let
VARIABLES = import ../../src/variables.nix; VARIABLES = import ../../src/variables.nix;
in { in
{
programs.hyprland.enable = true; programs.hyprland.enable = true;
services.udisks2 = { services.udisks2 = {
enable = true; enable = true;

View File

@ -1,6 +1,7 @@
let let
VARIABLES = import ../../src/variables.nix; VARIABLES = import ../../src/variables.nix;
in { in
{
home-manager.sharedModules = [ home-manager.sharedModules = [
{ {
programs.kitty = { programs.kitty = {

View File

@ -1,6 +1,7 @@
let let
VARIABLES = import ../../src/variables.nix; VARIABLES = import ../../src/variables.nix;
in { in
{
home-manager.sharedModules = [ home-manager.sharedModules = [
{ {
xdg.mimeApps = { xdg.mimeApps = {

View File

@ -1,6 +1,8 @@
{pkgs, ...}: let { pkgs, ... }:
let
VARIABLES = import ../../src/variables.nix; VARIABLES = import ../../src/variables.nix;
in { in
{
home-manager.sharedModules = [ home-manager.sharedModules = [
{ {
services.mpd = { services.mpd = {

View File

@ -1,4 +1,5 @@
{pkgs, ...}: let { pkgs, ... }:
let
vim-nix-rummik = pkgs.vimUtils.buildVimPluginFrom2Nix { vim-nix-rummik = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "vim-nix"; pname = "vim-nix";
version = "0def8020f152a51c011a707680780dac61a8989a"; version = "0def8020f152a51c011a707680780dac61a8989a";
@ -9,7 +10,8 @@
sha256 = "sha256-Q+Jx6/MgeE2hsd/a6FqfXpAOaRcNymZW6t75hYCcH4E="; sha256 = "sha256-Q+Jx6/MgeE2hsd/a6FqfXpAOaRcNymZW6t75hYCcH4E=";
}; };
}; };
in { in
{
programs.neovim.enable = true; programs.neovim.enable = true;
home-manager.sharedModules = [ home-manager.sharedModules = [

View File

@ -1,7 +1,6 @@
{ { lib
lib, , hyprland
hyprland, , ...
...
}: { }: {
home-manager.sharedModules = [ home-manager.sharedModules = [
{ {

View File

@ -1,6 +1,7 @@
let let
VARIABLES = import ../../src/variables.nix; VARIABLES = import ../../src/variables.nix;
in { in
{
home-manager.sharedModules = [ home-manager.sharedModules = [
{ {
xdg.userDirs = { xdg.userDirs = {

View File

@ -1,9 +1,9 @@
{ { lib
lib, , buildGoModule
buildGoModule, , fetchFromGitHub
fetchFromGitHub, , pkg-config
pkg-config, , vips
vips, ,
}: }:
buildGoModule rec { buildGoModule rec {
pname = "go-thumbnailer"; pname = "go-thumbnailer";

View File

@ -1,15 +1,16 @@
{ { pkgs
pkgs, , lib
lib, , hypr-contrib
hypr-contrib, , nix-gaming
nix-gaming, , crystal-flake
crystal-flake, , nixpkgs-hyprland-autoname-workspaces
nixpkgs-hyprland-autoname-workspaces, , nixpkgs-srb2
nixpkgs-srb2, , ...
... }:
}: let let
VARIABLES = import ./variables.nix; VARIABLES = import ./variables.nix;
in { in
{
imports = [ imports = [
"${VARIABLES.hostHardwareConfiguration}" "${VARIABLES.hostHardwareConfiguration}"
../overlays ../overlays