Skip to content

Commit e5e4f64

Browse files
PetarKirovPetarKirov
committed
style(nix): Format files with alejandra 
1 parent 742acea commit e5e4f64

20 files changed

+169
-138
lines changed

Diff for: ‎nixos/home/dconf.nix

+7-11
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
# Generated via dconf2nix: https://github.com/gvolpe/dconf2nix
2-
{ lib, ... }:
3-
4-
let
2+
{lib, ...}: let
53
mkTuple = lib.hm.gvariant.mkTuple;
6-
in
7-
{
4+
in {
85
dconf.settings = {
96
"com/gexperts/Tilix" = {
107
control-scroll-zoom = true;
@@ -24,16 +21,16 @@ in
2421
"org/gnome/desktop/wm/keybindings" = {
2522
switch-applications = [];
2623
switch-applications-backward = [];
27-
switch-windows = [ "<Alt>Tab" ];
28-
switch-windows-backward = [ "<Shift><Alt>Tab" ];
24+
switch-windows = ["<Alt>Tab"];
25+
switch-windows-backward = ["<Shift><Alt>Tab"];
2926
};
3027

3128
"org/gnome/desktop/wm/preferences" = {
3229
button-layout = "appmenu:minimize,maximize,close";
3330
};
3431

3532
"org/gnome/settings-daemon/plugins/media-keys" = {
36-
custom-keybindings = [ "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/" ];
33+
custom-keybindings = ["/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"];
3734
};
3835

3936
"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
@@ -45,8 +42,8 @@ in
4542
"org/gnome/desktop/input-sources" = {
4643
current = "uint32 0";
4744
per-window = false;
48-
sources = [ (mkTuple [ "xkb" "us" ]) (mkTuple [ "xkb" "bg+phonetic" ]) ];
49-
xkb-options = [ "terminate:ctrl_alt_bksp" ];
45+
sources = [(mkTuple ["xkb" "us"]) (mkTuple ["xkb" "bg+phonetic"])];
46+
xkb-options = ["terminate:ctrl_alt_bksp"];
5047
};
5148

5249
"org/gnome/desktop/interface" = {
@@ -58,6 +55,5 @@ in
5855
gtk-theme = "Yaru-dark";
5956
icon-theme = "Yaru";
6057
};
61-
6258
};
6359
}

Diff for: ‎nixos/home/git.nix

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
{ pkgs, ... }:
2-
{
1+
{pkgs, ...}: {
32
programs.git = {
43
enable = true;
54
package = pkgs.gitAndTools.gitFull;
65
delta.enable = true;
76
includes = [
8-
{ path = ../../.gitconfig; }
9-
{ path = ../../.config/git/aliases.gitconfig; }
10-
{ path = ../../.config/git/delta.gitconfig; }
11-
{ path = ../../.config/git/delta-themes.gitconfig; }
7+
{path = ../../.gitconfig;}
8+
{path = ../../.config/git/aliases.gitconfig;}
9+
{path = ../../.config/git/delta.gitconfig;}
10+
{path = ../../.config/git/delta-themes.gitconfig;}
1211
];
1312
};
1413
}

Diff for: ‎nixos/home/pkg-sets/dev-toolchain.nix

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
{ pkgs, unstablePkgs, ... }:
2-
1+
{
2+
pkgs,
3+
unstablePkgs,
4+
...
5+
}:
36
# Note:
47
# Most / all packages listed here are commented out,
58
# in favor of per project (dev)shell.nix files.

Diff for: ‎nixos/home/pkg-sets/gnome-themes.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
{ pkgs, ... }:
2-
{
1+
{pkgs, ...}: {
32
home.packages = with pkgs; [
43
gnome3.gnome-tweaks
54
paper-gtk-theme

Diff for: ‎nixos/home/pkg-sets/gui.nix

+13-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1-
{ pkgs, unstablePkgs, ... }:
21
{
2+
pkgs,
3+
unstablePkgs,
4+
...
5+
}: {
36
home.packages = with pkgs; [
47
## Browsers:
5-
google-chrome firefox # opera
8+
google-chrome
9+
firefox # opera
610

711
## Audio & video players:
8-
spotify vlc mpv
12+
spotify
13+
vlc
14+
mpv
915

1016
## Office:
1117
# libreoffice
@@ -31,7 +37,8 @@
3137
# teamviewer
3238

3339
## P2P:
34-
deluge transmission-gtk
40+
deluge
41+
transmission-gtk
3542

3643
## Terminal emulators:
3744
# alacritty
@@ -44,7 +51,8 @@
4451
blender
4552

4653
## Image editing:
47-
gimp inkscape
54+
gimp
55+
inkscape
4856
pick-colour-picker
4957
gcolor3
5058

Diff for: ‎nixos/home/pkg-sets/nix-related.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
{ pkgs, ... }:
2-
{
1+
{pkgs, ...}: {
32
home.packages = with pkgs; [
43
cachix
54
nix-index

Diff for: ‎nixos/home/pkg-sets/system-utils.nix

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
{ pkgs, ... }:
2-
{
1+
{pkgs, ...}: {
32
home.packages = with pkgs; [
43
## Networking
54
mullvad-vpn
@@ -8,7 +7,8 @@
87
# gptfdisk parted
98

109
## Disk recovery:
11-
ext4magic testdisk
10+
ext4magic
11+
testdisk
1212

1313
## Monitoring:
1414
# iotop
@@ -18,6 +18,7 @@
1818
# usbutils pciutils
1919

2020
## Archival and compression (unzip is installed via sys/*.nix):
21-
p7zip unrar
21+
p7zip
22+
unrar
2223
];
2324
}

Diff for: ‎nixos/machines/acer-vx15-nixos/configuration.nix

+19-17
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
1-
{ config, pkgs, ... }:
21
{
2+
config,
3+
pkgs,
4+
...
5+
}: {
36
networking.hostName = "acer-vx15-nixos";
47
hardware.nvidiaOptimus.disable = true;
58

6-
imports =
7-
[
8-
# Include the results of the hardware scan.
9-
./hardware-configuration.nix
9+
imports = [
10+
# Include the results of the hardware scan.
11+
./hardware-configuration.nix
1012

11-
# Include custom system configuration
12-
../../sys/boot.nix
13-
../../sys/networking.nix
14-
../../sys/i18n.nix
15-
../../sys/users.nix
16-
../../sys/gnome_desktop_env.nix
17-
../../sys/extra_services.nix
18-
../../sys/ledger-nano-udev-rules.nix
19-
../../sys/packages.nix
13+
# Include custom system configuration
14+
../../sys/boot.nix
15+
../../sys/networking.nix
16+
../../sys/i18n.nix
17+
../../sys/users.nix
18+
../../sys/gnome_desktop_env.nix
19+
../../sys/extra_services.nix
20+
../../sys/ledger-nano-udev-rules.nix
21+
../../sys/packages.nix
2022

21-
# Include https://github.com/nix-community/home-manager
22-
<home-manager/nixos>
23-
];
23+
# Include https://github.com/nix-community/home-manager
24+
<home-manager/nixos>
25+
];
2426

2527
# This value determines the NixOS release from which the default
2628
# settings for stateful data, like file locations and database versions

Diff for: ‎nixos/machines/acer-vx15-nixos/hardware-configuration.nix

+24-20
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,35 @@
11
# Do not modify this file! It was generated by ‘nixos-generate-config’
22
# and may be overwritten by future invocations. Please make changes
33
# to /etc/nixos/configuration.nix instead.
4-
{ config, lib, pkgs, modulesPath, ... }:
5-
64
{
7-
imports =
8-
[ (modulesPath + "/installer/scan/not-detected.nix")
9-
];
5+
config,
6+
lib,
7+
pkgs,
8+
modulesPath,
9+
...
10+
}: {
11+
imports = [
12+
(modulesPath + "/installer/scan/not-detected.nix")
13+
];
1014

11-
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
12-
boot.initrd.kernelModules = [ ];
13-
boot.kernelModules = [ "kvm-intel" ];
14-
boot.extraModulePackages = [ ];
15+
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_usb_sdmmc"];
16+
boot.initrd.kernelModules = [];
17+
boot.kernelModules = ["kvm-intel"];
18+
boot.extraModulePackages = [];
1519

16-
fileSystems."/" =
17-
{ device = "/dev/disk/by-uuid/6144099d-7fbd-4a99-95ab-099f5e407546";
18-
fsType = "ext4";
19-
};
20+
fileSystems."/" = {
21+
device = "/dev/disk/by-uuid/6144099d-7fbd-4a99-95ab-099f5e407546";
22+
fsType = "ext4";
23+
};
2024

21-
fileSystems."/boot" =
22-
{ device = "/dev/disk/by-uuid/0E3F-12C7";
23-
fsType = "vfat";
24-
};
25+
fileSystems."/boot" = {
26+
device = "/dev/disk/by-uuid/0E3F-12C7";
27+
fsType = "vfat";
28+
};
2529

26-
swapDevices =
27-
[ { device = "/dev/disk/by-uuid/c8e5b308-6971-47ca-89f7-e39f1e98933c"; }
28-
];
30+
swapDevices = [
31+
{device = "/dev/disk/by-uuid/c8e5b308-6971-47ca-89f7-e39f1e98933c";}
32+
];
2933

3034
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
3135
}

Diff for: ‎nixos/machines/mcl-nixos-desktop01/configuration.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
services.zfs = {
66
trim.enable = true;
77
autoScrub.enable = true;
8-
autoScrub.pools = [ "zfs_root" ];
8+
autoScrub.pools = ["zfs_root"];
99
};
1010
}

Diff for: ‎nixos/machines/mcl-nixos-desktop01/hardware-configuration.nix

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{lib, ...}: {
2-
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
3-
boot.initrd.kernelModules = [ ];
4-
boot.kernelModules = [ "kvm-intel" ];
5-
boot.extraModulePackages = [ ];
2+
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
3+
boot.initrd.kernelModules = [];
4+
boot.kernelModules = ["kvm-intel"];
5+
boot.extraModulePackages = [];
66

77
imports = [./file-systems.nix];
88

Diff for: ‎nixos/machines/zlx-nixos-desktop/hardware-configuration.nix

+20-17
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
11
# Do not modify this file! It was generated by ‘nixos-generate-config’
22
# and may be overwritten by future invocations. Please make changes
33
# to /etc/nixos/configuration.nix instead.
4-
{ config, lib, pkgs, ... }:
5-
64
{
7-
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
8-
boot.initrd.kernelModules = [ ];
9-
boot.kernelModules = [ "kvm-intel" ];
10-
boot.extraModulePackages = [ ];
5+
config,
6+
lib,
7+
pkgs,
8+
...
9+
}: {
10+
boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
11+
boot.initrd.kernelModules = [];
12+
boot.kernelModules = ["kvm-intel"];
13+
boot.extraModulePackages = [];
1114
hardware.enableRedistributableFirmware = true;
1215

13-
fileSystems."/" =
14-
{ device = "/dev/disk/by-uuid/477de8f0-6847-4a57-beb0-712beba1e5fb";
15-
fsType = "ext4";
16-
};
16+
fileSystems."/" = {
17+
device = "/dev/disk/by-uuid/477de8f0-6847-4a57-beb0-712beba1e5fb";
18+
fsType = "ext4";
19+
};
1720

18-
fileSystems."/boot" =
19-
{ device = "/dev/disk/by-uuid/41CE-DFCD";
20-
fsType = "vfat";
21-
};
21+
fileSystems."/boot" = {
22+
device = "/dev/disk/by-uuid/41CE-DFCD";
23+
fsType = "vfat";
24+
};
2225

23-
swapDevices =
24-
[ { device = "/dev/disk/by-uuid/8157c3e0-b3c4-4938-a5c0-c04193fc014f"; }
25-
];
26+
swapDevices = [
27+
{device = "/dev/disk/by-uuid/8157c3e0-b3c4-4938-a5c0-c04193fc014f";}
28+
];
2629

2730
nix.maxJobs = lib.mkDefault 4;
2831
powerManagement.cpuFreqGovernor = lib.mkDefault "performance";

Diff for: ‎nixos/machines/zlx-nixos-desktop2/configuration.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
services.zfs = {
66
trim.enable = true;
77
autoScrub.enable = true;
8-
autoScrub.pools = [ "zfs_root" ];
8+
autoScrub.pools = ["zfs_root"];
99
};
1010
}

Diff for: ‎nixos/sys/boot.nix

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
{ config, pkgs, ... }:
21
{
2+
config,
3+
pkgs,
4+
...
5+
}: {
36
boot.kernelPackages = pkgs.lib.mkOverride 1 config.boot.zfs.package.latestCompatibleLinuxPackages;
47
boot.kernel.sysctl."kernel.perf_event_paranoid" = 1;
5-
boot.supportedFilesystems = [ "zfs" ];
8+
boot.supportedFilesystems = ["zfs"];
69
boot.zfs.forceImportRoot = false;
710

811
boot.loader.systemd-boot.enable = true;

Diff for: ‎nixos/sys/configuration.nix

+17-15
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1-
{ config, pkgs, ... }:
21
{
3-
imports =
4-
[
5-
# Include the results of the hardware scan.
6-
./hardware-configuration.nix
2+
config,
3+
pkgs,
4+
...
5+
}: {
6+
imports = [
7+
# Include the results of the hardware scan.
8+
./hardware-configuration.nix
79

8-
# Include custom system configuration
9-
./boot.nix
10-
./networking.nix
11-
./i18n.nix
12-
./users.nix
13-
./gnome_desktop_env.nix
14-
./extra_services.nix
15-
./ledger-nano-udev-rules.nix
16-
./packages.nix
17-
];
10+
# Include custom system configuration
11+
./boot.nix
12+
./networking.nix
13+
./i18n.nix
14+
./users.nix
15+
./gnome_desktop_env.nix
16+
./extra_services.nix
17+
./ledger-nano-udev-rules.nix
18+
./packages.nix
19+
];
1820

1921
# This value determines the NixOS release from which the default
2022
# settings for stateful data, like file locations and database versions

0 commit comments

Comments
 (0)