nixfmt changes

This commit is contained in:
Gerg-L 2023-12-03 21:59:58 -05:00
parent 36176f647c
commit f25c8638ee
Signed by: gerg-l
SSH key fingerprint: SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
36 changed files with 133 additions and 135 deletions

View file

@ -1,4 +1,4 @@
{ suckless, self, ... }:
{suckless, self, ...}:
{
pkgs,
config,
@ -11,7 +11,7 @@
config = lib.mkIf config.local.DE.dwm.enable {
systemd.user.services = {
sxhkd = {
path = [ pkgs.sxhkd ];
path = [pkgs.sxhkd];
script = "sxhkd -c /etc/sxhkd/sxhkdrc";
serviceConfig = {
Restart = "always";
@ -21,7 +21,7 @@
};
picom = {
path = [ pkgs.picom ];
path = [pkgs.picom];
script = "picom";
serviceConfig = {
Restart = "always";
@ -78,7 +78,7 @@
numlockx
picom
sxhkd
;
;
};
etc."sxhkd/sxhkdrc".text = ''
XF86AudioPlay

View file

@ -10,14 +10,14 @@ _:
config = lib.mkIf config.local.DE.gnome.enable {
environment = {
systemPackages = [ pkgs.gnome.gnome-calculator ];
systemPackages = [pkgs.gnome.gnome-calculator];
gnome.excludePackages = builtins.attrValues {
inherit (pkgs)
gnome-photos
gnome-tour
gnome-text-editor
gnome-online-accounts
;
;
inherit (pkgs.gnome)
gnome-weather
gnome-shell
@ -38,7 +38,7 @@ _:
iagno # go game
hitori # sudoku game
atomix # puzzle game
;
;
};
};

View file

@ -9,7 +9,7 @@ _:
options.local.DE.xfce.enable = lib.mkEnableOption "";
config = lib.mkIf config.local.DE.xfce.enable {
environment.systemPackages = [ pkgs.xfce.xfce4-whiskermenu-plugin ];
environment.systemPackages = [pkgs.xfce.xfce4-whiskermenu-plugin];
services.xserver = {
enable = true;
desktopManager.xfce = {

View file

@ -1,5 +1,5 @@
_:
{ config, lib, ... }:
{config, lib, ...}:
{
options.local.DM = {
autoLogin = lib.mkEnableOption "";

View file

@ -1,5 +1,5 @@
{ self, ... }:
{ config, lib, ... }:
{self, ...}:
{config, lib, ...}:
{
options.local.DM.lightdm.enable = lib.mkEnableOption "";

View file

@ -1,5 +1,5 @@
_:
{ pkgs, lib, ... }:
{pkgs, lib, ...}:
{
services.xserver = {
tty = lib.mkDefault 1;
@ -7,7 +7,7 @@ _:
layout = "us";
libinput.enable = true;
xautolock.enable = false;
excludePackages = [ pkgs.xterm ];
excludePackages = [pkgs.xterm];
desktopManager.xterm.enable = false;
};
_file = ./X11.nix;

View file

@ -1,4 +1,4 @@
{ self, ... }:
{self, ...}:
{
lib,
pkgs,
@ -15,7 +15,7 @@
};
};
boot = {
blacklistedKernelModules = [ "pcspkr" ];
blacklistedKernelModules = ["pcspkr"];
kernelParams = lib.mkBefore [
"acpi_call"
"pti=auto"
@ -78,8 +78,8 @@
Type = "oneshot";
RemainAfterExit = true;
};
path = [ pkgs.efibootmgr ];
wantedBy = [ "default.target" ];
path = [pkgs.efibootmgr];
wantedBy = ["default.target"];
script = ''
efibootmgr -t 0
'';

View file

@ -1,5 +1,5 @@
_:
{ config, lib, ... }:
{config, lib, ...}:
{
options.local.remoteBuild = {
enable = lib.mkEnableOption "";
@ -13,8 +13,8 @@ _:
keep-derivations = false;
builders-use-substitutes = true;
max-jobs = 0;
substituters = [ "ssh-ng://nix-ssh@gerg-desktop" ];
trusted-public-keys = [ "gerg-desktop:6p1+h6jQnb1MOt3ra3PlQpfgEEF4zRrQWiEuAqcjBj8=" ];
substituters = ["ssh-ng://nix-ssh@gerg-desktop"];
trusted-public-keys = ["gerg-desktop:6p1+h6jQnb1MOt3ra3PlQpfgEEF4zRrQWiEuAqcjBj8="];
};
distributedBuilds = true;
buildMachines = [
@ -40,7 +40,7 @@ _:
};
programs.ssh.knownHosts = {
gerg-desktop = {
extraHostNames = [ "gerg-desktop.lan" ];
extraHostNames = ["gerg-desktop.lan"];
publicKey = config.local.keys.root_gerg-desktop;
};
};
@ -54,9 +54,9 @@ _:
];
in
lib.mkIf config.local.remoteBuild.isBuilder {
sops.secrets.store_key = { };
sops.secrets.store_key = {};
users = {
groups.builder = { };
groups.builder = {};
users.builder = {
createHome = false;
isSystemUser = true;

View file

@ -1,5 +1,5 @@
_:
{ config, lib, ... }:
{config, lib, ...}:
let
cfg = config.local.hardware;
in

View file

@ -1,7 +1,7 @@
_:
{ lib, ... }:
{lib, ...}:
{
options.local.keys = lib.mkOption { };
options.local.keys = lib.mkOption {};
config.local.keys = {
gerg_gerg-phone = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDU6BnoHIgMLgZVGuvi03J9l5Z1yP1P5Q8QPyjRHyi77";

View file

@ -8,7 +8,7 @@ _:
{
options.local.allowedUnfree = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [ ];
default = [];
};
config = {
@ -31,7 +31,7 @@ _:
nix-output-monitor # nom nom nom nom;
nix-tree # view packages
pciutils # lspci
;
;
}
);
@ -39,7 +39,7 @@ _:
programs.mtr.enable = true; # ping and traceroute
services.openssh = {
enable = true;
hostKeys = lib.mkForce [ ];
hostKeys = lib.mkForce [];
settings = {
PermitRootLogin = lib.mkDefault "no";
PasswordAuthentication = false;

View file

@ -1,13 +1,13 @@
inputs:
{ lib, config, ... }:
{lib, config, ...}:
{
#
# Flake registry and $NIX_PATH pinning
#
nix.registry = lib.pipe inputs [
(lib.filterAttrs (_: lib.isType "flake"))
(lib.mapAttrs (_: flake: { inherit flake; }))
(x: x // { nixpkgs.flake = inputs.unstable; })
(lib.mapAttrs (_: flake: {inherit flake;}))
(x: x // {nixpkgs.flake = inputs.unstable;})
];
environment.etc =
@ -17,7 +17,7 @@ inputs:
value.source = value.flake;
})
config.nix.registry;
nix.nixPath = [ "/etc/nix/path" ];
nix.nixPath = ["/etc/nix/path"];
#
# Ignore global registry
#
@ -51,8 +51,8 @@ inputs:
# Use for testing
#
#allow-import-from-derivation = false;
trusted-users = [ "root" ];
allowed-users = [ "@wheel" ];
trusted-users = ["root"];
allowed-users = ["@wheel"];
use-xdg-base-directories = true;
auto-allocate-uids = true;
};

View file

@ -1,4 +1,4 @@
{ fetch-rs, ... }:
{fetch-rs, ...}:
{
pkgs,
config,
@ -6,7 +6,7 @@
...
}:
{
systemd.tmpfiles.rules = [ "d /tmp/neovim-page 0777 root root - -" ];
systemd.tmpfiles.rules = ["d /tmp/neovim-page 0777 root root - -"];
environment = {
systemPackages = builtins.attrValues {
inherit (pkgs) page eza fzf;

View file

@ -1,4 +1,4 @@
{ sops-nix, self, ... }:
{sops-nix, self, ...}:
{
pkgs,
config,
@ -6,13 +6,13 @@
...
}:
{
imports = [ sops-nix.nixosModules.sops ];
imports = [sops-nix.nixosModules.sops];
options.local.sops.disable = lib.mkEnableOption "";
config = lib.mkIf (!config.local.sops.disable) {
environment.systemPackages = [ pkgs.sops ];
environment.systemPackages = [pkgs.sops];
sops = {
defaultSopsFile = "${self}/hosts/${config.networking.hostName}/secrets.yaml";
age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
};
};
_file = ./sops.nix;

View file

@ -62,16 +62,16 @@ in
fonts = {
packages = [
pkgs.overpass
(pkgs.nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
(pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
];
enableDefaultPackages = false;
fontDir.enable = true;
fontconfig = {
enable = true;
defaultFonts = {
serif = [ "Overpass" ];
sansSerif = [ "Overpass" ];
monospace = [ "Overpass Mono" ];
serif = ["Overpass"];
sansSerif = ["Overpass"];
monospace = ["Overpass Mono"];
};
hinting.enable = true;
antialias = true;