diff --git a/flake.nix b/flake.nix index b4da9be..6aec5ac 100755 --- a/flake.nix +++ b/flake.nix @@ -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; }; + }; }; }; - }; } diff --git a/hosts/marauder/backup.nix b/hosts/marauder/backup.nix index 58c2213..9e45edf 100755 --- a/hosts/marauder/backup.nix +++ b/hosts/marauder/backup.nix @@ -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" ]; }; }; diff --git a/hosts/marauder/default.nix b/hosts/marauder/default.nix index c8a19f3..bff17d5 100755 --- a/hosts/marauder/default.nix +++ b/hosts/marauder/default.nix @@ -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"; } - diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index 7081176..1be73a2 100755 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -1,4 +1,4 @@ -{ self, pkgs, secrets, ... }: +{ self, ... }: { imports = [ self.nixosModules.common diff --git a/modules/prompt.nix b/modules/prompt.nix index a96ec61..68f8b27 100644 --- a/modules/prompt.nix +++ b/modules/prompt.nix @@ -1,4 +1,4 @@ -{ options, lib, config, ... }: +{ lib, config, ... }: { options.promptEmoji = lib.mkOption { type = lib.types.str;