Skip to content

Commit

Permalink
style(nix): Format files with alejandra
Browse files Browse the repository at this point in the history
  • Loading branch information
PetarKirov committed Jul 3, 2022
1 parent 742acea commit 6e4bf27
Showing 20 changed files with 169 additions and 138 deletions.
18 changes: 7 additions & 11 deletions nixos/home/dconf.nix
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
# Generated via dconf2nix: https://github.com/gvolpe/dconf2nix
{ lib, ... }:

let
{lib, ...}: let
mkTuple = lib.hm.gvariant.mkTuple;
in
{
in {
dconf.settings = {
"com/gexperts/Tilix" = {
control-scroll-zoom = true;
@@ -24,16 +21,16 @@ in
"org/gnome/desktop/wm/keybindings" = {
switch-applications = [];
switch-applications-backward = [];
switch-windows = [ "<Alt>Tab" ];
switch-windows-backward = [ "<Shift><Alt>Tab" ];
switch-windows = ["<Alt>Tab"];
switch-windows-backward = ["<Shift><Alt>Tab"];
};

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

"org/gnome/settings-daemon/plugins/media-keys" = {
custom-keybindings = [ "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/" ];
custom-keybindings = ["/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"];
};

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

"org/gnome/desktop/interface" = {
@@ -58,6 +55,5 @@ in
gtk-theme = "Yaru-dark";
icon-theme = "Yaru";
};

};
}
11 changes: 5 additions & 6 deletions nixos/home/git.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
programs.git = {
enable = true;
package = pkgs.gitAndTools.gitFull;
delta.enable = true;
includes = [
{ path = ../../.gitconfig; }
{ path = ../../.config/git/aliases.gitconfig; }
{ path = ../../.config/git/delta.gitconfig; }
{ path = ../../.config/git/delta-themes.gitconfig; }
{path = ../../.gitconfig;}
{path = ../../.config/git/aliases.gitconfig;}
{path = ../../.config/git/delta.gitconfig;}
{path = ../../.config/git/delta-themes.gitconfig;}
];
};
}
7 changes: 5 additions & 2 deletions nixos/home/pkg-sets/dev-toolchain.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{ pkgs, unstablePkgs, ... }:

{
pkgs,
unstablePkgs,
...
}:
# Note:
# Most / all packages listed here are commented out,
# in favor of per project (dev)shell.nix files.
3 changes: 1 addition & 2 deletions nixos/home/pkg-sets/gnome-themes.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
home.packages = with pkgs; [
gnome3.gnome-tweaks
paper-gtk-theme
18 changes: 13 additions & 5 deletions nixos/home/pkg-sets/gui.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
{ pkgs, unstablePkgs, ... }:
{
pkgs,
unstablePkgs,
...
}: {
home.packages = with pkgs; [
## Browsers:
google-chrome firefox # opera
google-chrome
firefox # opera

## Audio & video players:
spotify vlc mpv
spotify
vlc
mpv

## Office:
# libreoffice
@@ -31,7 +37,8 @@
# teamviewer

## P2P:
deluge transmission-gtk
deluge
transmission-gtk

## Terminal emulators:
# alacritty
@@ -44,7 +51,8 @@
blender

## Image editing:
gimp inkscape
gimp
inkscape
pick-colour-picker
gcolor3

3 changes: 1 addition & 2 deletions nixos/home/pkg-sets/nix-related.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
home.packages = with pkgs; [
cachix
nix-index
9 changes: 5 additions & 4 deletions nixos/home/pkg-sets/system-utils.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
home.packages = with pkgs; [
## Networking
mullvad-vpn
@@ -8,7 +7,8 @@
# gptfdisk parted

## Disk recovery:
ext4magic testdisk
ext4magic
testdisk

## Monitoring:
# iotop
@@ -18,6 +18,7 @@
# usbutils pciutils

## Archival and compression (unzip is installed via sys/*.nix):
p7zip unrar
p7zip
unrar
];
}
36 changes: 19 additions & 17 deletions nixos/machines/acer-vx15-nixos/configuration.nix
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
{ config, pkgs, ... }:
{
config,
pkgs,
...
}: {
networking.hostName = "acer-vx15-nixos";
hardware.nvidiaOptimus.disable = true;

imports =
[
# Include the results of the hardware scan.
./hardware-configuration.nix
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix

# Include custom system configuration
../../sys/boot.nix
../../sys/networking.nix
../../sys/i18n.nix
../../sys/users.nix
../../sys/gnome_desktop_env.nix
../../sys/extra_services.nix
../../sys/ledger-nano-udev-rules.nix
../../sys/packages.nix
# Include custom system configuration
../../sys/boot.nix
../../sys/networking.nix
../../sys/i18n.nix
../../sys/users.nix
../../sys/gnome_desktop_env.nix
../../sys/extra_services.nix
../../sys/ledger-nano-udev-rules.nix
../../sys/packages.nix

# Include https://github.com/nix-community/home-manager
<home-manager/nixos>
];
# Include https://github.com/nix-community/home-manager
<home-manager/nixos>
];

# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
44 changes: 24 additions & 20 deletions nixos/machines/acer-vx15-nixos/hardware-configuration.nix
Original file line number Diff line number Diff line change
@@ -1,31 +1,35 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:

{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];

boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_usb_sdmmc"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];

fileSystems."/" =
{ device = "/dev/disk/by-uuid/6144099d-7fbd-4a99-95ab-099f5e407546";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/6144099d-7fbd-4a99-95ab-099f5e407546";
fsType = "ext4";
};

fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/0E3F-12C7";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/0E3F-12C7";
fsType = "vfat";
};

swapDevices =
[ { device = "/dev/disk/by-uuid/c8e5b308-6971-47ca-89f7-e39f1e98933c"; }
];
swapDevices = [
{device = "/dev/disk/by-uuid/c8e5b308-6971-47ca-89f7-e39f1e98933c";}
];

powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
}
2 changes: 1 addition & 1 deletion nixos/machines/mcl-nixos-desktop01/configuration.nix
Original file line number Diff line number Diff line change
@@ -5,6 +5,6 @@
services.zfs = {
trim.enable = true;
autoScrub.enable = true;
autoScrub.pools = [ "zfs_root" ];
autoScrub.pools = ["zfs_root"];
};
}
8 changes: 4 additions & 4 deletions nixos/machines/mcl-nixos-desktop01/hardware-configuration.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{lib, ...}: {
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];

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

37 changes: 20 additions & 17 deletions nixos/machines/zlx-nixos-desktop/hardware-configuration.nix
Original file line number Diff line number Diff line change
@@ -1,28 +1,31 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, ... }:

{
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
config,
lib,
pkgs,
...
}: {
boot.initrd.availableKernelModules = ["xhci_pci" "ehci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
hardware.enableRedistributableFirmware = true;

fileSystems."/" =
{ device = "/dev/disk/by-uuid/477de8f0-6847-4a57-beb0-712beba1e5fb";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/477de8f0-6847-4a57-beb0-712beba1e5fb";
fsType = "ext4";
};

fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/41CE-DFCD";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/41CE-DFCD";
fsType = "vfat";
};

swapDevices =
[ { device = "/dev/disk/by-uuid/8157c3e0-b3c4-4938-a5c0-c04193fc014f"; }
];
swapDevices = [
{device = "/dev/disk/by-uuid/8157c3e0-b3c4-4938-a5c0-c04193fc014f";}
];

nix.maxJobs = lib.mkDefault 4;
powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
2 changes: 1 addition & 1 deletion nixos/machines/zlx-nixos-desktop2/configuration.nix
Original file line number Diff line number Diff line change
@@ -5,6 +5,6 @@
services.zfs = {
trim.enable = true;
autoScrub.enable = true;
autoScrub.pools = [ "zfs_root" ];
autoScrub.pools = ["zfs_root"];
};
}
7 changes: 5 additions & 2 deletions nixos/sys/boot.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{ config, pkgs, ... }:
{
config,
pkgs,
...
}: {
boot.kernelPackages = pkgs.lib.mkOverride 1 config.boot.zfs.package.latestCompatibleLinuxPackages;
boot.kernel.sysctl."kernel.perf_event_paranoid" = 1;
boot.supportedFilesystems = [ "zfs" ];
boot.supportedFilesystems = ["zfs"];
boot.zfs.forceImportRoot = false;

boot.loader.systemd-boot.enable = true;
32 changes: 17 additions & 15 deletions nixos/sys/configuration.nix
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
{ config, pkgs, ... }:
{
imports =
[
# Include the results of the hardware scan.
./hardware-configuration.nix
config,
pkgs,
...
}: {
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix

# Include custom system configuration
./boot.nix
./networking.nix
./i18n.nix
./users.nix
./gnome_desktop_env.nix
./extra_services.nix
./ledger-nano-udev-rules.nix
./packages.nix
];
# Include custom system configuration
./boot.nix
./networking.nix
./i18n.nix
./users.nix
./gnome_desktop_env.nix
./extra_services.nix
./ledger-nano-udev-rules.nix
./packages.nix
];

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

0 comments on commit 6e4bf27

Please sign in to comment.