Format nix files

This commit is contained in:
2024-08-06 14:58:30 -06:00
parent 57049fe511
commit 0992eba4dc
5 changed files with 30 additions and 29 deletions

View File

@@ -6,26 +6,27 @@
};
outputs = { self, nixpkgs, ... }@inputs:
let
secrets = builtins.fromJSON (builtins.readFile ./secrets.json);
in {
nixosModules = {
common = import ./modules/common.nix;
prompt = import ./modules/prompt.nix;
server = import ./modules/server.nix;
};
let
secrets = builtins.fromJSON (builtins.readFile ./secrets.json);
in
{
nixosModules = {
common = import ./modules/common.nix;
prompt = import ./modules/prompt.nix;
server = import ./modules/server.nix;
};
nixosConfigurations = {
marauder = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [ ./hosts/marauder ];
specialArgs = { inherit self inputs secrets; };
};
monolith = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [ ./hosts/monolith ];
specialArgs = { inherit self inputs secrets; };
nixosConfigurations = {
marauder = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [ ./hosts/marauder ];
specialArgs = { inherit self inputs secrets; };
};
monolith = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [ ./hosts/monolith ];
specialArgs = { inherit self inputs secrets; };
};
};
};
};
}

View File

@@ -20,7 +20,7 @@
script = "notify-send -u critical \"Backup to B2 failed\" \"$(journalctl -u restic-backups-b2 -n 5 -o cat)\"";
};
restic-backups-b2 = {
onFailure = ["notify-backup-b2-failed.service"];
onFailure = [ "notify-backup-b2-failed.service" ];
};
};

View File

@@ -3,7 +3,8 @@ let
ffcheck = pkgs.writeShellScriptBin "ffcheck" ''
${pkgs.ffmpeg}/bin/ffmpeg -v error -stats -hide_banner -i "$1" -c copy -f null -
'';
in {
in
{
imports = [
self.nixosModules.common
self.nixosModules.prompt
@@ -39,7 +40,7 @@ in {
"sd_mod"
];
};
kernelModules = ["kvm-amd"];
kernelModules = [ "kvm-amd" ];
kernelParams = [ "amd_pstate=active" ];
};
@@ -49,7 +50,7 @@ in {
opengl = {
enable = true;
driSupport32Bit = true;
extraPackages = [pkgs.vaapiVdpau];
extraPackages = [ pkgs.vaapiVdpau ];
};
nvidia.prime = {
offload = {
@@ -105,10 +106,10 @@ in {
enable = true;
};
services.xserver = {
services.xserver = {
enable = true;
videoDrivers = ["nvidia"];
desktopManager = {
videoDrivers = [ "nvidia" ];
desktopManager = {
cinnamon.enable = true;
xterm.enable = false;
};
@@ -132,4 +133,3 @@ in {
system.stateVersion = "24.05";
}

View File

@@ -1,4 +1,4 @@
{ self, pkgs, secrets, ... }:
{ self, ... }:
{
imports = [
self.nixosModules.common

View File

@@ -1,4 +1,4 @@
{ options, lib, config, ... }:
{ lib, config, ... }:
{
options.promptEmoji = lib.mkOption {
type = lib.types.str;