chore: cleanup all files

home/common.nix

@@ -1,41 +1,41 @@
-{
-  mkDashDefault,
-  config,
-  lib,
-  ...
-}: let
-  username = config.conf.username;
-in {
-  manual = {
-    html.enable = mkDashDefault false;
-    json.enable = mkDashDefault false;
-    manpages.enable = mkDashDefault false;
-  };
-
-  fonts.fontconfig.enable = mkDashDefault true;
-
-  home = {
-    username = mkDashDefault username;
-    homeDirectory = mkDashDefault "/home/${username}";
-    sessionPath = ["$HOME/.cargo/bin"];
-
-    enableNixpkgsReleaseCheck = mkDashDefault false;
-    sessionVariables = {
-      GOROOT = mkDashDefault "$HOME/.go";
-      QT_QPA_PLATFORMTHEME = mkDashDefault "qt5ct";
-    };
-
-    keyboard = mkDashDefault null;
-  };
-
-  programs.nix-index = {
-    enable = mkDashDefault true;
-    enableFishIntegration = mkDashDefault true;
-  };
-
-  nix = {
-    extraOptions = lib.mkIf (config ? sops.secrets && config.sops.secrets ? access.path) ''
-      !include ${config.sops.secrets.access.path}
-    '';
-  };
-}
+{
+  mkDashDefault,
+  config,
+  lib,
+  ...
+}: let
+  username = config.conf.username;
+in {
+  manual = {
+    html.enable = mkDashDefault false;
+    json.enable = mkDashDefault false;
+    manpages.enable = mkDashDefault false;
+  };
+
+  fonts.fontconfig.enable = mkDashDefault true;
+
+  home = {
+    username = mkDashDefault username;
+    homeDirectory = mkDashDefault "/home/${username}";
+    sessionPath = ["$HOME/.cargo/bin"];
+
+    enableNixpkgsReleaseCheck = mkDashDefault false;
+    sessionVariables = {
+      GOROOT = mkDashDefault "$HOME/.go";
+      QT_QPA_PLATFORMTHEME = mkDashDefault "qt5ct";
+    };
+
+    keyboard = mkDashDefault null;
+  };
+
+  programs.nix-index = {
+    enable = mkDashDefault true;
+    enableFishIntegration = mkDashDefault true;
+  };
+
+  nix = {
+    extraOptions = lib.mkIf (config ? sops.secrets && config.sops.secrets ? access.path) ''
+      !include ${config.sops.secrets.access.path}
+    '';
+  };
+}

home/default.nix

@@ -1,49 +1,59 @@
-{
-  mkDashDefault,
-  additionalHomeConfig,
-  additionalHomeMods,
-  additionalInputs,
-  config,
-  homeMods,
-  inputs,
-  lib,
-  mod,
-  pkgs,
-  root,
-  alternativePkgs,
-  system,
-  stable,
-  unstable,
-  ...
-}: {
-  xdg = {
-    portal.config.common.default = mkDashDefault "*";
-    portal = {
-      enable = mkDashDefault true;
-      extraPortals = [pkgs.xdg-desktop-portal-gtk];
-    };
-  };
-  home-manager = {
-    useGlobalPkgs = mkDashDefault true;
-    useUserPackages = mkDashDefault true;
-    extraSpecialArgs = {
-      inherit inputs root additionalInputs alternativePkgs system stable unstable;
-      mkDashDefault = import ../lib/override.nix {inherit lib;};
-    };
-
-    users.${config.conf.username} = {
-      disabledModules = ["programs/anyrun.nix"];
-      imports =
-        [
-          ./common.nix
-          ./themes
-          ./sync.nix
-          ../lib/foxwrappers.nix
-        ]
-        ++ homeMods
-        ++ additionalHomeMods
-        ++ lib.optional (builtins.pathExists mod) mod
-        ++ lib.optional (builtins.pathExists additionalHomeConfig) additionalHomeConfig;
-    };
-  };
-}
+{
+  mkDashDefault,
+  additionalHomeConfig,
+  additionalHomeMods,
+  additionalInputs,
+  dashNixAdditionalProps,
+  config,
+  homeMods,
+  inputs,
+  lib,
+  mod,
+  pkgs,
+  root,
+  alternativePkgs,
+  system,
+  stable,
+  unstable,
+  ...
+}: {
+  xdg = {
+    portal.config.common.default = mkDashDefault "*";
+    portal = {
+      enable = mkDashDefault true;
+      extraPortals = [pkgs.xdg-desktop-portal-gtk];
+    };
+  };
+  home-manager = {
+    useGlobalPkgs = mkDashDefault true;
+    useUserPackages = mkDashDefault true;
+    extraSpecialArgs = {
+      inherit
+        inputs
+        root
+        additionalInputs
+        alternativePkgs
+        system
+        stable
+        unstable
+        dashNixAdditionalProps
+        ;
+      mkDashDefault = import ../lib/override.nix {inherit lib;};
+    };
+
+    users.${config.conf.username} = {
+      disabledModules = ["programs/anyrun.nix"];
+      imports =
+        [
+          ./common.nix
+          ./themes
+          ./sync.nix
+          ../lib/foxwrappers.nix
+        ]
+        ++ homeMods
+        ++ additionalHomeMods
+        ++ lib.optional (builtins.pathExists mod) mod
+        ++ lib.optional (builtins.pathExists additionalHomeConfig) additionalHomeConfig;
+    };
+  };
+}

home/themes/firefoxTheme.nix

@@ -289,37 +289,41 @@
       }
     '';
   browsername = config.mods.homePackages.browser;
-  profiles = 
-  if config.mods.homePackages.browser == "firefox" then 
-    config.mods.browser.firefox.profiles
-    else if config.mods.homePackages.browser == "zen" then 
-      config.mods.browser.zen.profiles
-    else if config.mods.homePackages.browser == "librewolf" then 
-      [{name = "default"; value = {};}]
-    else 
-    [];
+  profiles =
+    if config.mods.homePackages.browser == "firefox"
+    then config.mods.browser.firefox.profiles
+    else if config.mods.homePackages.browser == "zen"
+    then config.mods.browser.zen.profiles
+    else if config.mods.homePackages.browser == "librewolf"
+    then [
+      {
+        name = "default";
+        value = {};
+      }
+    ]
+    else [];
   profileNamesFn =
     builtins.catAttrs "name";
   chromesFn = builtins.map (
     name:
-    if (builtins.isString browsername)
-    then {
-      ".${browsername}/${name}/chrome/userContent.css" = {
-        text = userChrome;
-      };
+      if (builtins.isString browsername)
+      then {
+        ".${browsername}/${name}/chrome/userContent.css" = {
+          text = userChrome;
+        };
 
-      ".${browsername}/${name}/chrome/userChrome.css" = {
-        text = userContent;
-      };
-    }
-    else {}
+        ".${browsername}/${name}/chrome/userChrome.css" = {
+          text = userContent;
+        };
+      }
+      else {}
   );
   moduleFn = lib.lists.foldr (attr1: attr2: attr1 // attr2) {};
-  mkFirefoxTheme = (profiles:
-    profiles
-    |> profileNamesFn
-    |> chromesFn
-    |> moduleFn
-    );
-in
-  {home.file = mkFirefoxTheme profiles;}
+  mkFirefoxTheme = (
+    profiles:
+      profiles
+      |> profileNamesFn
+      |> chromesFn
+      |> moduleFn
+  );
+in {home.file = mkFirefoxTheme profiles;}