new formatter (#7)

flake.nix

@@ -37,25 +37,29 @@
     };
   };
 
-  outputs = inputs: let
+  outputs =
-    lib = inputs.snowfall-lib.mkLib {
+    inputs:
-      inherit inputs;
+    let
-      src = ./.;
+      lib = inputs.snowfall-lib.mkLib {
+        inherit inputs;
+        src = ./.;
 
-      snowfall = {
+        snowfall = {
-        meta = {
+          meta = {
-          name = "wyrdgard";
+            name = "wyrdgard";
-          title = "Wyrdgard";
+            title = "Wyrdgard";
+          };
+
+          namespace = "wyrdgard";
         };
-
-        namespace = "wyrdgard";
       };
-    };
+    in
-  in
     lib.mkFlake {
-      channels-config = {allowUnfree = true;};
+      channels-config = {
+        allowUnfree = true;
+      };
 
-      outputs-builder = channels: {formatter = channels.nixpkgs.alejandra;};
+      outputs-builder = channels: { formatter = channels.nixpkgs.nixfmt-rfc-style; };
 
       overlays = with inputs; [
         snowfall-flake.overlays.default

homes/x86_64-linux/cholli@workvm/default.nix

@@ -2,11 +2,12 @@
   lib,
   pkgs,
   config,
-  osConfig ? {},
+  osConfig ? { },
   format ? "unknown",
   ...
 }:
-with lib.wyrdgard; {
+with lib.wyrdgard;
+{
   wyrdgard = {
     apps = {
       kitty = enabled;

homes/x86_64-linux/cholli@yggdrasil/default.nix

@@ -2,11 +2,12 @@
   lib,
   pkgs,
   config,
-  osConfig ? {},
+  osConfig ? { },
   format ? "unknown",
   ...
 }:
-with lib.wyrdgard; {
+with lib.wyrdgard;
+{
   wyrdgard = {
     apps = {
       kitty = enabled;

lib/module/default.nix

@@ -1,5 +1,6 @@
-{lib, ...}:
+{ lib, ... }:
-with lib; rec {
+with lib;
+rec {
   ## Create a NixOS module option.
   ##
   ## ```nix
@@ -7,8 +8,9 @@ with lib; rec {
   ## ```
   ##
   #@ Type -> Any -> String
-  mkOpt = type: default: description:
+  mkOpt =
-    mkOption {inherit type default description;};
+    type: default: description:
+    mkOption { inherit type default description; };
 
   ## Create a NixOS module option without a description.
   ##

modules/home/apps/cli-apps/fish/default.nix

@@ -6,44 +6,43 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.apps.cli-apps.fish;
-in {
+in
+{
   options.wyrdgard.apps.cli-apps.fish = with types; {
     enable = mkBoolOpt true "Whether or not to enable the fish shell";
   };
 
-  config =
+  config = mkIf cfg.enable {
-    mkIf cfg.enable {
+    home.packages = with pkgs.fishPlugins; [
-      home.packages = with pkgs.fishPlugins; [
+      forgit
-        forgit
+      sponge
-        sponge
+    ];
-      ];
 
-      programs = {
+    programs = {
-        fish = {
+      fish = {
-          enable = true;
+        enable = true;
-          shellInit = "
+        shellInit = "
 	zoxide init fish | source
 	direnv hook fish | source
 	source ~/.config/op/plugins.sh
 	";
-          shellAliases = {
+        shellAliases = {
-            vim = "nvim";
+          vim = "nvim";
-            ls = "colorls --gs";
+          ls = "colorls --gs";
-            l = "ls -l";
+          l = "ls -l";
-            la = "ls -a";
+          la = "ls -a";
-            lla = "ls -la";
+          lla = "ls -la";
-            lt = "ls --tree";
+          lt = "ls --tree";
-          };
-        };
-
-        zoxide = {
-          enable = true;
-          options = [
-            "--cmd cd"
-          ];
         };
       };
+
+      zoxide = {
+        enable = true;
+        options = [ "--cmd cd" ];
+      };
     };
+  };
 }

modules/home/apps/cli-apps/home-manager/default.nix

@@ -1,17 +1,13 @@
-{
+{ lib, config, ... }:
-  lib,
-  config,
-  ...
-}:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.apps.cli-apps.home-manager;
-in {
+in
+{
   options.wyrdgard.apps.cli-apps.home-manager = {
     enable = mkBoolOpt true "Enable home-manager";
   };
 
-  config = mkIf cfg.enable {
+  config = mkIf cfg.enable { programs.home-manager = enabled; };
-    programs.home-manager = enabled;
-  };
 }

modules/home/apps/cli-apps/starship/default.nix

@@ -6,69 +6,69 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.apps.cli-apps.starship;
-in {
+in
+{
   options.wyrdgard.apps.cli-apps.starship = with types; {
     enable = mkBoolOpt true "Whether or not to enable starship shell";
   };
 
-  config =
+  config = mkIf cfg.enable {
-    mkIf cfg.enable {
+    programs = {
-      programs = {
+      fish.shellInit = "
-        fish.shellInit = "
-
 	starship init fish | source
       ";
 
-        starship = {
+      starship = {
-          enable = true;
+        enable = true;
-          enableTransience = true;
+        enableTransience = true;
-          settings = {
+        settings = {
-            character = {
+          character = {
-              error_symbol = "[ ](bold red)";
+            error_symbol = "[ ](bold red)";
-            };
+          };
-            time = {
+          time = {
-              disabled = false;
+            disabled = false;
-              time_format = "%T";
+            time_format = "%T";
-              utc_time_offset = "+1";
+            utc_time_offset = "+1";
-            };
+          };
-            username = {
+          username = {
-              style_user = "#00de00";
+            style_user = "#00de00";
-              style_root = "red";
+            style_root = "red";
-              format = "[$user]($style) ";
+            format = "[$user]($style) ";
-              disabled = false;
+            disabled = false;
-              show_always = true;
+            show_always = true;
-            };
+          };
-            hostname = {
+          hostname = {
-              ssh_only = false;
+            ssh_only = false;
-              format = "@ [$hostname](bold yellow) ";
+            format = "@ [$hostname](bold yellow) ";
-              disabled = false;
+            disabled = false;
-            };
+          };
-            directory = {
+          directory = {
-              home_symbol = "󰋞 ~";
+            home_symbol = "󰋞 ~";
-              read_only_style = "197";
+            read_only_style = "197";
-              read_only = "  ";
+            read_only = "  ";
-              format = "at [$path]($style)[$read_only]($read_only_style) ";
+            format = "at [$path]($style)[$read_only]($read_only_style) ";
-            };
+          };
-            git_metrics = {
+          git_metrics = {
-              disabled = false;
+            disabled = false;
-              added_style = "bold blue";
+            added_style = "bold blue";
-              format = "[+$added]($added_style)/[-$deleted]($deleted_style) ";
+            format = "[+$added]($added_style)/[-$deleted]($deleted_style) ";
-            };
+          };
-            git_status = {
+          git_status = {
-              format = "([$all_status$ahead_behind]($style) )";
+            format = "([$all_status$ahead_behind]($style) )";
-              ahead = "[↑$count](bold green)";
+            ahead = "[↑$count](bold green)";
-              behind = "[↓$count](bold red)";
+            behind = "[↓$count](bold red)";
-              diverged = "[↕↓$ahead_count↑$behind_count](red)";
+            diverged = "[↕↓$ahead_count↑$behind_count](red)";
-              deleted = "[✘$count](red) ";
+            deleted = "[✘$count](red) ";
-              modified = "[!$count](yellow) ";
+            modified = "[!$count](yellow) ";
-              staged = "[+$count](green) ";
+            staged = "[+$count](green) ";
-              renamed = "[➜$count](green) ";
+            renamed = "[➜$count](green) ";
-              untracked = "[?$count](blue) ";
+            untracked = "[?$count](blue) ";
-            };
           };
         };
       };
     };
+  };
 }

modules/home/apps/graphviz/default.nix

@@ -5,17 +5,17 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.apps.graphviz;
-in {
+in
+{
   options.wyrdgard.apps.graphviz = {
     enable = mkBoolOpt true "Whether or not you want to install graphviz";
   };
 
   config = mkIf cfg.enable {
-    home.packages = with pkgs; [
+    home.packages = with pkgs; [ graphviz ];
-      graphviz
-    ];
 
     home.shellAliases = {
       nixsize = "nix-du -n=50 | dot -Tsvg > ~/Pictures/store.svg";

modules/home/apps/kitty/default.nix

@@ -5,17 +5,17 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.apps.kitty;
-in {
+in
+{
   options.wyrdgard.apps.kitty = {
     enable = mkEnableOption "Kity";
   };
 
   config = mkIf cfg.enable {
-    home.packages = with pkgs; [
+    home.packages = with pkgs; [ kitty ];
-      kitty
-    ];
 
     programs.kitty = {
       enable = true;

modules/home/tools/direnv/default.nix

@@ -6,9 +6,11 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.tools.direnv;
-in {
+in
+{
   options.wyrdgard.tools.direnv = with types; {
     enable = mkBoolOpt false "Whether or not to enable direnv.";
   };

modules/home/tools/git/default.nix

@@ -6,10 +6,12 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.tools.git;
   user = config.wyrdgard.user;
-in {
+in
+{
   options.wyrdgard.tools.git = {
     enable = mkBoolOpt true "Enable Git (Default true)";
     userName = mkOpt types.str user.fullName "The name to configure git with.";
@@ -22,9 +24,15 @@ in {
       inherit (cfg) userName userEmail;
       lfs = enabled;
       extraConfig = {
-        init = {defaultBranch = "main";};
+        init = {
-        pull = {rebase = false;};
+          defaultBranch = "main";
-        push = {autoSetupRemote = true;};
+        };
+        pull = {
+          rebase = false;
+        };
+        push = {
+          autoSetupRemote = true;
+        };
       };
     };
   };

modules/home/user/default.nix

@@ -2,10 +2,16 @@
   lib,
   config,
   pkgs,
-  osConfig ? {},
+  osConfig ? { },
   ...
-}: let
+}:
-  inherit (lib) types mkIf mkDefault mkMerge;
+let
+  inherit (lib)
+    types
+    mkIf
+    mkDefault
+    mkMerge
+    ;
   inherit (lib.wyrdgard) mkOpt;
 
   cfg = config.wyrdgard.user;
@@ -14,15 +20,18 @@
   is-darwin = pkgs.stdenv.isDarwin;
 
   home-directory =
-    if cfg.name == null
+    if cfg.name == null then
-    then null
+      null
-    else if is-darwin
+    else if is-darwin then
-    then "/Users/${cfg.name}"
+      "/Users/${cfg.name}"
-    else "/home/${cfg.name}";
+    else
-in {
+      "/home/${cfg.name}";
+in
+{
   options.wyrdgard.user = {
     enable = mkOpt types.bool true "Whether to configure the user account.";
-    name = mkOpt (types.nullOr types.str) (config.snowfallorg.user.name or "cholli") "The user account.";
+    name = mkOpt (types.nullOr types.str) (config.snowfallorg.user.name or "cholli"
+    ) "The user account.";
 
     fullName = mkOpt types.str "Christoph Hollizeck" "The full name of the user.";
     email = mkOpt types.str "christoph.hollizeck@hey.com" "The email of the user.";

modules/nixos/apps/_1password/default.nix

@@ -6,9 +6,11 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.apps._1password;
-in {
+in
+{
   options.wyrdgard.apps._1password = with types; {
     enable = mkBoolOpt true "Enable 1Password";
   };
@@ -18,7 +20,7 @@ in {
       _1password.enable = true;
       _1password-gui = {
         enable = true;
-        polkitPolicyOwners = [config.wyrdgard.user.name];
+        polkitPolicyOwners = [ config.wyrdgard.user.name ];
       };
     };
   };

modules/nixos/apps/cli-apps/nixvim/default.nix

@@ -6,14 +6,19 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.apps.cli-apps.nixvim;
-in {
+in
+{
   options.wyrdgard.apps.cli-apps.nixvim = with types; {
     enable = mkBoolOpt true "Whether to enable nixvim or not (Default true)";
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [less wyrdgard.neovim];
+    environment.systemPackages = with pkgs; [
+      less
+      wyrdgard.neovim
+    ];
   };
 }

modules/nixos/apps/discord/default.nix

@@ -6,16 +6,14 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.apps.discord;
-in {
+in
+{
   options.wyrdgard.apps.discord = with types; {
     enable = mkBoolOpt false "Whether or not to enable basic configuration";
   };
 
-  config = mkIf cfg.enable {
+  config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ discord ]; };
-    environment.systemPackages = with pkgs; [
-      discord
-    ];
-  };
 }

modules/nixos/apps/steam/default.nix

@@ -6,9 +6,11 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.apps.steam;
-in {
+in
+{
   options.wyrdgard.apps.steam = with types; {
     enable = mkBoolOpt false "Whether or not to enable support for Steam.";
   };
@@ -17,8 +19,6 @@ in {
     programs.steam.enable = true;
     programs.steam.remotePlay.openFirewall = true;
 
-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = with pkgs; [ steam ];
-      steam
-    ];
   };
 }

modules/nixos/apps/vivaldi/default.nix

@@ -6,9 +6,11 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.apps.vivaldi;
-in {
+in
+{
   options.wyrdgard.apps.vivaldi = with types; {
     enable = mkBoolOpt false "Whether or not to enable vivaldi browser";
   };

modules/nixos/archetypes/gaming/default.nix

@@ -6,9 +6,11 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.archetypes.gaming;
-in {
+in
+{
   options.wyrdgard.archetypes.gaming = with types; {
     enable = mkBoolOpt false "Whether or not to enable the gaming archetype.";
   };

modules/nixos/home/default.nix

@@ -7,17 +7,17 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.home;
-in {
+in
+{
   options.wyrdgard.home = with types; {
-    file =
+    file = mkOpt attrs { } (mdDoc "A set of files to be managed by home-manager's `home.file`.");
-      mkOpt attrs {}
+    configFile = mkOpt attrs { } (
-      (mdDoc "A set of files to be managed by home-manager's `home.file`.");
+      mdDoc "A set of files to be managed by home-manager's `xdg.configFile`."
-    configFile =
+    );
-      mkOpt attrs {}
+    extraOptions = mkOpt attrs { } "Options to pass directly to home-manager.";
-      (mdDoc "A set of files to be managed by home-manager's `xdg.configFile`.");
-    extraOptions = mkOpt attrs {} "Options to pass directly to home-manager.";
   };
 
   config = {

modules/nixos/nix/default.nix

@@ -7,35 +7,39 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.nix;
 
-  substituters-submodule = types.submodule ({name, ...}: {
+  substituters-submodule = types.submodule (
-    options = with types; {
+    { name, ... }:
-      key = mkOpt (nullOr str) null "The trusted public key for this substituter.";
+    {
-    };
+      options = with types; {
-  });
+        key = mkOpt (nullOr str) null "The trusted public key for this substituter.";
-in {
+      };
+    }
+  );
+in
+{
   options.wyrdgard.nix = with types; {
     enable = mkBoolOpt true "Whether or not to manage nix configuration.";
     package = mkOpt package pkgs.nixUnstable "Which nix package to use.";
 
     default-substituter = {
       url = mkOpt str "https://cache.nixos.org" "The url for the substituter.";
-      key = mkOpt str "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "The trusted public key for the substituter.";
+      key =
+        mkOpt str "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+          "The trusted public key for the substituter.";
     };
 
-    extra-substituters = mkOpt (attrsOf substituters-submodule) {} "Extra substituters to configure.";
+    extra-substituters = mkOpt (attrsOf substituters-submodule) { } "Extra substituters to configure.";
   };
 
   config = mkIf cfg.enable {
-    assertions =
+    assertions = mapAttrsToList (name: value: {
-      mapAttrsToList
+      assertion = value.key != null;
-      (name: value: {
+      message = "wyrdgard.nix.extra-substituters.${name}.key must be set";
-        assertion = value.key != null;
+    }) cfg.extra-substituters;
-        message = "wyrdgard.nix.extra-substituters.${name}.key must be set";
-      })
-      cfg.extra-substituters;
 
     environment.systemPackages = with pkgs; [
       snowfallorg.flake
@@ -44,46 +48,49 @@ in {
       nix-du
     ];
 
-    nix = let
+    nix =
-      users =
+      let
-        ["root" config.wyrdgard.user.name]
+        users = [
-        ++ optional config.services.hydra.enable "hydra";
+          "root"
-    in {
+          config.wyrdgard.user.name
-      package = cfg.package;
+        ] ++ optional config.services.hydra.enable "hydra";
+      in
+      {
+        package = cfg.package;
 
-      settings =
+        settings =
-        {
+          {
-          experimental-features = "nix-command flakes";
+            experimental-features = "nix-command flakes";
-          http-connections = 50;
+            http-connections = 50;
-          warn-dirty = false;
+            warn-dirty = false;
-          log-lines = 50;
+            log-lines = 50;
-          sandbox = "relaxed";
+            sandbox = "relaxed";
-          auto-optimise-store = true;
+            auto-optimise-store = true;
-          trusted-users = users;
+            trusted-users = users;
-          allowed-users = users;
+            allowed-users = users;
 
-          substituters =
+            substituters = [
-            [cfg.default-substituter.url]
+              cfg.default-substituter.url
-            ++ (mapAttrsToList (name: value: name) cfg.extra-substituters);
+            ] ++ (mapAttrsToList (name: value: name) cfg.extra-substituters);
-          trusted-public-keys =
+            trusted-public-keys = [
-            [cfg.default-substituter.key]
+              cfg.default-substituter.key
-            ++ (mapAttrsToList (name: value: value.key) cfg.extra-substituters);
+            ] ++ (mapAttrsToList (name: value: value.key) cfg.extra-substituters);
-        }
+          }
-        // (lib.optionalAttrs config.wyrdgard.tools.direnv.enable {
+          // (lib.optionalAttrs config.wyrdgard.tools.direnv.enable {
-          keep-outputs = true;
+            keep-outputs = true;
-          keep-derivations = true;
+            keep-derivations = true;
-        });
+          });
 
-      gc = {
+        gc = {
-        automatic = true;
+          automatic = true;
-        dates = "daily";
+          dates = "daily";
-        options = "--delete-older-than 7d";
+          options = "--delete-older-than 7d";
+        };
+
+        # flake-utils-plus
+        generateRegistryFromInputs = true;
+        generateNixPathFromInputs = true;
+        linkInputs = true;
       };
-
-      # flake-utils-plus
-      generateRegistryFromInputs = true;
-      generateNixPathFromInputs = true;
-      linkInputs = true;
-    };
   };
 }

modules/nixos/submodules/basics/default.nix

@@ -6,9 +6,11 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.submodules.basics;
-in {
+in
+{
   options.wyrdgard.submodules.basics = with types; {
     enable = mkBoolOpt false "Whether or not to enable basic configuration.";
   };

modules/nixos/submodules/games/default.nix

@@ -6,17 +6,17 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.submodules.games;
-in {
+in
+{
   options.wyrdgard.submodules.games = with types; {
     enable = mkBoolOpt false "Whether or not you want to enable steam and other games";
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = with pkgs; [ prismlauncher ];
-      prismlauncher
-    ];
 
     wyrdgard = {
       apps = {

modules/nixos/submodules/graphical-interface/default.nix

@@ -6,9 +6,11 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.submodules.graphical-interface;
-in {
+in
+{
   options.wyrdgard.submodules.graphical-interface = with types; {
     enable = mkBoolOpt false "Whether to enable a graphical interface";
   };

modules/nixos/submodules/socials/default.nix

@@ -6,9 +6,11 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.submodules.socials;
-in {
+in
+{
   options.wyrdgard.submodules.socials = with types; {
     enable = mkBoolOpt false "Whether to enable social apps";
   };

modules/nixos/system/boot/default.nix

@@ -6,9 +6,11 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.system.boot;
-in {
+in
+{
   options.wyrdgard.system.boot = with types; {
     enable = mkBoolOpt false "Whether or not to enable booting.";
   };

modules/nixos/system/fonts/default.nix

@@ -6,12 +6,14 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.system.fonts;
-in {
+in
+{
   options.wyrdgard.system.fonts = with types; {
     enable = mkBoolOpt false "Whether or not to manage fonts.";
-    fonts = mkOpt (listOf package) [] "Custom font packages to install.";
+    fonts = mkOpt (listOf package) [ ] "Custom font packages to install.";
   };
 
   config = mkIf cfg.enable {
@@ -20,13 +22,17 @@ in {
       LOG_ICONS = "true";
     };
 
-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = with pkgs; [ font-manager ];
-      font-manager
-    ];
 
-    fonts.packages = with pkgs;
+    fonts.packages =
+      with pkgs;
       [
-        (nerdfonts.override {fonts = ["CodeNewRoman" "NerdFontsSymbolsOnly"];})
+        (nerdfonts.override {
+          fonts = [
+            "CodeNewRoman"
+            "NerdFontsSymbolsOnly"
+          ];
+        })
         font-awesome
         powerline-fonts
         powerline-symbols

modules/nixos/system/hardware/audio/default.nix

@@ -6,17 +6,17 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.system.hardware.audio;
-in {
+in
+{
   options.wyrdgard.system.hardware.audio = with types; {
     enable = mkBoolOpt false "Whether or not to enable audio";
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = with pkgs; [ noisetorch ];
-      noisetorch
-    ];
 
     programs.noisetorch.enable = true;
 

modules/nixos/system/hardware/bluetooth/default.nix

@@ -6,17 +6,17 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.system.hardware.bluetooth;
-in {
+in
+{
   options.wyrdgard.system.hardware.bluetooth = with types; {
     enable = mkBoolOpt false "Whether or not to enable bluetooth";
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = with pkgs; [ libsForQt5.bluez-qt ];
-      libsForQt5.bluez-qt
-    ];
 
     hardware.bluetooth = {
       enable = true;
@@ -31,7 +31,11 @@ in {
 
     fileSystems."/var/lib/bluetooth" = {
       device = "/persist/var/lib/bluetooth";
-      options = ["bind" "noauto" "x-systemd.automount"];
+      options = [
+        "bind"
+        "noauto"
+        "x-systemd.automount"
+      ];
       noCheck = true;
     };
 

modules/nixos/system/hardware/gpu/nvidia/default.nix

@@ -6,9 +6,11 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.system.hardware.gpu.nvidia;
-in {
+in
+{
   options.wyrdgard.system.hardware.gpu.nvidia = with types; {
     enable = mkEnableOption "Enable Nvidia GPU";
   };
@@ -29,7 +31,7 @@ in {
       package = config.boot.kernelPackages.nvidiaPackages.beta; # stable, beta
     };
 
-    services.xserver.videoDrivers = ["nvidia"];
+    services.xserver.videoDrivers = [ "nvidia" ];
     services.xserver.displayManager.sddm.wayland.enable = lib.mkForce false;
   };
 }

modules/nixos/system/hardware/networking/default.nix

@@ -6,14 +6,14 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.system.hardware.networking;
-in {
+in
+{
   options.wyrdgard.system.hardware.networking = with types; {
     enable = mkBoolOpt false "Whether or not to enable networking";
   };
 
-  config = mkIf cfg.enable {
+  config = mkIf cfg.enable { networking.networkmanager.enable = true; };
-    networking.networkmanager.enable = true;
-  };
 }

modules/nixos/system/locale/default.nix

@@ -6,9 +6,11 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.system.locale;
-in {
+in
+{
   options.wyrdgard.system.locale = with types; {
     enable = mkBoolOpt false "Whether or not to manage locale settings.";
   };

modules/nixos/system/time/default.nix

@@ -6,15 +6,14 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.system.time;
-in {
+in
+{
   options.wyrdgard.system.time = with types; {
-    enable =
+    enable = mkBoolOpt false "Whether or not to configure timezone information.";
-      mkBoolOpt false "Whether or not to configure timezone information.";
   };
 
-  config = mkIf cfg.enable {
+  config = mkIf cfg.enable { time.timeZone = "Europe/Berlin"; };
-    time.timeZone = "Europe/Berlin";
-  };
 }

modules/nixos/system/xkb/default.nix

@@ -5,9 +5,11 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.system.xkb;
-in {
+in
+{
   options.wyrdgard.system.xkb = with types; {
     enable = mkBoolOpt false "Whether or not to configure xkb.";
   };

modules/nixos/tools/direnv/default.nix

@@ -6,9 +6,11 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.tools.direnv;
-in {
+in
+{
   options.wyrdgard.tools.direnv = with types; {
     enable = mkBoolOpt false "Whether or not to enable direnv.";
   };

modules/nixos/tools/git/default.nix

@@ -6,10 +6,12 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.tools.git;
   user = config.wyrdgard.user;
-in {
+in
+{
   options.wyrdgard.tools.git = with types; {
     enable = mkBoolOpt true "Wether or not to enable git (Default enabled)";
     userName = mkOpt types.str user.fullName "The name to use git with";
@@ -26,9 +28,15 @@ in {
       enable = true;
       lfs.enable = true;
       config = {
-        init = {defaultBranch = "main";};
+        init = {
-        pull = {rebase = false;};
+          defaultBranch = "main";
-        push = {autoSetupRemote = true;};
+        };
+        pull = {
+          rebase = false;
+        };
+        push = {
+          autoSetupRemote = true;
+        };
       };
     };
   };

modules/nixos/tools/nix-ld/default.nix

@@ -6,14 +6,14 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.tools.nix-ld;
-in {
+in
+{
   options.wyrdgard.tools.nix-ld = with types; {
     enable = mkBoolOpt false "Wether or not to enable nix-ld";
   };
 
-  config = mkIf cfg.enable {
+  config = mkIf cfg.enable { programs.nix-ld.enable = true; };
-    programs.nix-ld.enable = true;
-  };
 }

modules/nixos/user/default.nix

@@ -6,7 +6,8 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; let
+with lib.wyrdgard;
+let
   cfg = config.wyrdgard.user;
   defaultIconFileName = "profile.png";
   defaultIcon = pkgs.stdenvNoCC.mkDerivation {
@@ -19,37 +20,37 @@ with lib.wyrdgard; let
       cp $src $out
     '';
 
-    passthru = {fileName = defaultIconFileName;};
+    passthru = {
+      fileName = defaultIconFileName;
+    };
   };
   propagatedIcon =
     pkgs.runCommandNoCC "propagated-icon"
-    {passthru = {fileName = cfg.icon.fileName;};}
+      {
-    ''
+        passthru = {
-      local target="$out/share/wyrdgard-icons/user/${cfg.name}"
+          fileName = cfg.icon.fileName;
-      mkdir -p "$target"
+        };
+      }
+      ''
+        local target="$out/share/wyrdgard-icons/user/${cfg.name}"
+        mkdir -p "$target"
 
-      cp ${cfg.icon} "$target/${cfg.icon.fileName}"
+        cp ${cfg.icon} "$target/${cfg.icon.fileName}"
-    '';
+      '';
-in {
+in
+{
   options.wyrdgard.user = with types; {
     name = mkOpt str "cholli" "The name to use for the user account.";
     fullName = mkOpt str "Christoph Hollizeck" "The full name of the user.";
     email = mkOpt str "christoph.hollizeck@hey.com" "The email of the user.";
-    initialPassword =
+    initialPassword = mkOpt str "asdf" "The initial password to use when the user is first created.";
-      mkOpt str "asdf"
+    icon = mkOpt (nullOr package) defaultIcon "The profile picture to use for the user.";
-      "The initial password to use when the user is first created.";
+    extraGroups = mkOpt (listOf str) [ ] "Groups for the user to be assigned.";
-    icon =
+    extraOptions = mkOpt attrs { } (mdDoc "Extra options passed to `users.users.<name>`.");
-      mkOpt (nullOr package) defaultIcon
-      "The profile picture to use for the user.";
-    extraGroups = mkOpt (listOf str) [] "Groups for the user to be assigned.";
-    extraOptions =
-      mkOpt attrs {}
-      (mdDoc "Extra options passed to `users.users.<name>`.");
   };
 
   config = {
-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = with pkgs; [ ];
-    ];
 
     programs.zsh = {
       enable = true;
@@ -67,33 +68,28 @@ in {
         "Videos/.keep".text = "";
         "projects/.keep".text = "";
         ".face".source = cfg.icon;
-        "Pictures/${
+        "Pictures/${cfg.icon.fileName or (builtins.baseNameOf cfg.icon)}".source = cfg.icon;
-          cfg.icon.fileName or (builtins.baseNameOf cfg.icon)
-        }".source =
-          cfg.icon;
       };
     };
 
-    users.users.${cfg.name} =
+    users.users.${cfg.name} = {
-      {
+      isNormalUser = true;
-        isNormalUser = true;
 
-        inherit (cfg) name initialPassword;
+      inherit (cfg) name initialPassword;
 
-        home = "/home/${cfg.name}";
+      home = "/home/${cfg.name}";
-        group = "users";
+      group = "users";
 
-        shell = pkgs.zsh;
+      shell = pkgs.zsh;
 
-        # Arbitrary user ID to use for the user. Since I only
+      # Arbitrary user ID to use for the user. Since I only
-        # have a single user on my machines this won't ever collide.
+      # have a single user on my machines this won't ever collide.
-        # However, if you add multiple users you'll need to change this
+      # However, if you add multiple users you'll need to change this
-        # so each user has their own unique uid (or leave it out for the
+      # so each user has their own unique uid (or leave it out for the
-        # system to select).
+      # system to select).
-        uid = 1000;
+      uid = 1000;
 
-        extraGroups = ["steamcmd"] ++ cfg.extraGroups;
+      extraGroups = [ "steamcmd" ] ++ cfg.extraGroups;
-      }
+    } // cfg.extraOptions;
-      // cfg.extraOptions;
   };
 }

overlays/vivaldi/default.nix

@@ -0,0 +1,5 @@
+{ channels, ... }:
+
+final: prev: {
+  vivaldi = prev.vivaldi.override { commandLineArgs = "--disable-features=AllowQt"; };
+}

systems/x86_64-linux/workvm/default.nix

@@ -5,14 +5,14 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; {
+with lib.wyrdgard;
-  imports = [./hardware.nix];
+{
+  imports = [ ./hardware.nix ];
 
-  boot.blacklistedKernelModules = ["hyperv-fb"];
+  boot.blacklistedKernelModules = [ "hyperv-fb" ];
   virtualisation.hypervGuest.videoMode = "1920x1080";
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ ];
-  ];
 
   environment.variables.EDITOR = "nvim";
   environment.variables.SUDOEDITOR = "nvim";

systems/x86_64-linux/workvm/hardware.nix

@@ -7,13 +7,17 @@
   pkgs,
   modulesPath,
   ...
-}: {
+}:
-  imports = [];
+{
+  imports = [ ];
 
-  boot.initrd.availableKernelModules = ["sd_mod" "sr_mod"];
+  boot.initrd.availableKernelModules = [
-  boot.initrd.kernelModules = [];
+    "sd_mod"
-  boot.kernelModules = [];
+    "sr_mod"
-  boot.extraModulePackages = [];
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/c58c66b3-4e0f-4393-8d7b-871d934856e3";
@@ -25,7 +29,7 @@
     fsType = "vfat";
   };
 
-  swapDevices = [];
+  swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

systems/x86_64-linux/yggdrasil/default.nix

@@ -5,13 +5,13 @@
   ...
 }:
 with lib;
-with lib.wyrdgard; {
+with lib.wyrdgard;
-  imports = [./hardware.nix];
+{
+  imports = [ ./hardware.nix ];
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ ];
-  ];
 
-  environment.pathsToLink = ["/libexec"];
+  environment.pathsToLink = [ "/libexec" ];
 
   wyrdgard = {
     archetypes = {

systems/x86_64-linux/yggdrasil/hardware.nix

@@ -7,15 +7,24 @@
   pkgs,
   modulesPath,
   ...
-}: {
+}:
-  imports = [
+{
-    (modulesPath + "/installer/scan/not-detected.nix")
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-  ];
 
-  boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
+  boot.initrd.availableKernelModules = [
-  boot.initrd.kernelModules = [];
+    "nvme"
-  boot.kernelModules = ["kvm-amd" "btusb"];
+    "xhci_pci"
-  boot.extraModulePackages = [];
+    "ahci"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [
+    "kvm-amd"
+    "btusb"
+  ];
+  boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/444a9216-59d1-46e0-9643-0b716a42ba0b";
@@ -27,7 +36,7 @@
     fsType = "vfat";
   };
 
-  swapDevices = [];
+  swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's