feat: refactored home manager

home/default.nix

@@ -1,176 +1,46 @@
 let
-  modulesPath = ./modules;
+  # Recursively collect directories
-  miscPath = modulesPath + "/misc";
+  collectDirs =
+    path:
+    let
+      content = builtins.readDir path;
+      subdirs = builtins.filter (name: content.${name} == "directory") (builtins.attrNames content);
+      buildPath = name: path + "/${name}";
 
-  moduleImport =
+      # Get immediate subdirectories
-    path: nameTransform:
+      thisDirs = map buildPath subdirs;
+      # Recursively get sub-subdirectories
+      subDirs = builtins.concatMap collectDirs thisDirs;
+    in
+    [ path ] ++ subDirs;
+
+  # Import directories and their default.nix files
+  directoryImport =
+    path:
     builtins.listToAttrs (
-      map
+      map (dir: {
-        (name: {
+        name = baseNameOf (toString dir);
-          name = nameTransform name;
+        value = import dir;
-          value = import (path + "/${name}");
+      }) (collectDirs path)
-        })
-        (
-          builtins.filter (
-            name: (builtins.readDir path).${name} == "regular" && builtins.match ".*\\.nix$" name != null
-          ) (builtins.attrNames (builtins.readDir path))
-        )
     );
 
-  modules =
+  # Create the modules attrset
-    moduleImport modulesPath (
+  modules = directoryImport ./.;
-      name:
-      builtins.replaceStrings
-        [
-          ".nix"
-        ]
-        [
-          ""
-        ]
-        name
-    )
-    // moduleImport miscPath (
-      name:
-      "misc-${
-        builtins.replaceStrings
-          [
-            ".nix"
-          ]
-          [
-            ""
-          ]
-          name
-      }"
-    )
-    //
-      (
-        path:
-        builtins.listToAttrs (
-          map
-            (name: {
-              name = name;
-              value = import (path + "/${name}");
-            })
-            (
-              builtins.filter (name: (builtins.readDir path).${name} == "directory" && name != "misc") (
-                builtins.attrNames (builtins.readDir path)
-              )
-            )
-        )
-      )
-        modulesPath;
 in
 {
   flake.homeModules = {
     desktop = {
       imports = builtins.attrValues {
         inherit (modules)
-          brave
+          cli
-          flameshot
+          gui
-          misc-android
-          misc-desktop
-          misc-internet
-          misc-tracking
           ;
       };
     };
-
+    server = {
-    entertainment = {
       imports = builtins.attrValues {
         inherit (modules)
-          freetube
+          cli
-          misc-entertainment
-          mpv
-          steam
-          ;
-      };
-    };
-
-    firefox = {
-      imports = builtins.attrValues {
-        inherit (modules)
-          firefox
-          ;
-      };
-    };
-
-    hyprland = {
-      imports = builtins.attrValues {
-        inherit (modules)
-          gtk
-          dunst
-          easyEffects
-          gammastep
-          hyprland
-          misc-hyprland
-          network
-          swaylock
-          tofi
-          waybar
-          ;
-      };
-    };
-    productionArt = {
-      imports = builtins.attrValues {
-        inherit (modules)
-          misc-productionArt
-          ;
-      };
-    };
-
-    productionAudio = {
-      imports = builtins.attrValues {
-        inherit (modules)
-          misc-productionAudio
-          ;
-      };
-    };
-
-    productionCode = {
-      imports = builtins.attrValues {
-        inherit (modules)
-          neovim
-          vscode
-          zed
-          ;
-      };
-    };
-
-    productionVideo = {
-      imports = builtins.attrValues {
-        inherit (modules)
-          misc-productionVideo
-          obs-studio
-          yt-dlp
-          ;
-      };
-    };
-
-    productionWriting = {
-      imports = builtins.attrValues {
-        inherit (modules)
-          misc-productionWriting
-          ;
-      };
-    };
-
-    shared = {
-      imports = builtins.attrValues {
-        inherit (modules)
-          bottom
-          direnv
-          fastfetch
-          ghostty
-          git
-          helix
-          homeManager
-          lazygit
-          misc-commandLine
-          nushell
-          starship
-          yazi
-          zellij
-          zoxide
           ;
       };
     };

home/modules/brave/config/extensions.nix

@@ -1,8 +0,0 @@
-[
-  {id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} # uBlock Origin
-  {id = "cmpdlhmnmjhihmcfnigoememnffkimlk";} # Catppuccin Macchiato
-  {id = "dlnpfhfhmkiebpnlllpehlmklgdggbhn";} # Don't Close Last Tab
-  {id = "iplffkdpngmdjhlpjmppncnlhomiipha";} # Unpaywall
-  {id = "mnjggcdmjocbbbhaepdhchncahnbgone";} # SponsorBlock
-  {id = "ponfpcnoihfmfllpaingbgckeeldkhle";} # YouTube Enhancer
-]

home/modules/brave/default.nix

@@ -1,9 +0,0 @@
-{
-  programs.brave = let
-    configPath = ./config;
-    extensionsPath = import (configPath + /extensions.nix);
-  in {
-    enable = true;
-    extensions = extensionsPath;
-  };
-}

home/modules/cli/android/androidFileTransfer/default.nix

@@ -1,13 +1,12 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  ...
+}:
+{
   home.packages = builtins.attrValues {
-    inherit
+    inherit (pkgs)
-      (pkgs)
       android-file-transfer
-      android-tools
-      deskreen
-      scrcpy
       ;
   };
 }
 # requires that users be part of the adbusers group
-

home/modules/cli/android/androidTools/default.nix

@@ -0,0 +1,12 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      android-tools
+      ;
+  };
+}
+# requires that users be part of the adbusers group

home/modules/cli/android/default.nix

@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}

home/modules/cli/android/simpleMtpfs/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      simple-mtpfs
+      ;
+  };
+}

home/modules/cli/default.nix

@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}

home/modules/cli/development/default.nix

@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}

home/modules/cli/development/editing/default.nix

@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}

home/modules/cli/development/editing/helix/default.nix

@@ -0,0 +1,19 @@
+{
+  pkgs,
+  flake,
+  ...
+}:
+{
+  programs.helix =
+    let
+      configPath = ./config;
+      settingsPath = import (configPath + /settings.nix);
+      languagesPath = import (configPath + /languages.nix);
+    in
+    {
+      enable = true;
+      package = flake.inputs.helix.packages.${pkgs.system}.default;
+      languages = languagesPath;
+      settings = settingsPath;
+    };
+}

home/modules/cli/development/versioning/default.nix

@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}

home/modules/cli/development/versioning/git/default.nix

@@ -2,10 +2,12 @@
   config,
   flake,
   ...
-}: let
+}:
+let
   user = config.home.username;
   userConfig = flake.config.people.users.${user};
-in {
+in
+{
   programs.git = {
     enable = true;
     userName = userConfig.name;

home/modules/cli/files/default.nix

@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}

home/modules/cli/files/ncdu/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      ncdu
+      ;
+  };
+}

home/modules/cli/files/samba/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      samba
+      ;
+  };
+}

home/modules/cli/files/unrar/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      unrar
+      ;
+  };
+}

home/modules/cli/files/yazi/default.nix

@@ -0,0 +1,22 @@
+{
+  flake,
+  pkgs,
+  ...
+}:
+{
+  programs.yazi =
+    let
+      configPath = ./config;
+      keymapPath = import (configPath + /keymap.nix);
+      settingsPath = import (configPath + /settings.nix);
+    in
+    {
+      enable = true;
+      # package = flake.inputs.yazi.packages.${pkgs.system}.yazi;
+      enableNushellIntegration = true;
+      keymap = keymapPath;
+      settings = settingsPath;
+    };
+  # Keymap
+  # https://github.com/sxyazi/yazi/blob/main/yazi-config/preset/keymap.toml
+}

home/modules/cli/files/zip/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      zip
+      ;
+  };
+}

home/modules/cli/shell/default.nix

@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}

home/modules/cli/shell/zoxide/default.nix

@@ -1,4 +1,5 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   programs.zoxide = {
     enable = true;
     enableNushellIntegration = true;

home/modules/cli/utilities/alsaUtils/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      alsa-utils
+      ;
+  };
+}

home/modules/cli/utilities/brightnessCtl/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      brightnessctl
+      ;
+  };
+}

home/modules/cli/utilities/cifsUtils/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      cifs-utils
+      ;
+  };
+}

home/modules/cli/utilities/default.nix

@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}

home/modules/cli/utilities/direnv/default.nix

@@ -2,7 +2,8 @@
   flake,
   pkgs,
   ...
-}: {
+}:
+{
   programs.direnv = {
     enable = true;
     package = flake.inputs.direnv.packages.${pkgs.system}.default;

home/modules/cli/utilities/fastFetch/default.nix

@@ -1,7 +1,8 @@
 let
   configPath = ./config;
   settingsPath = import (configPath + /settings.nix);
-in {
+in
+{
   programs.fastfetch = {
     enable = true;
     settings = settingsPath;

home/modules/cli/utilities/ffmpeg/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      ffmpeg
+      ;
+  };
+}

home/modules/cli/utilities/flac/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      flac
+      ;
+  };
+}

home/modules/cli/utilities/gLib/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      glib
+      ;
+  };
+}

home/modules/cli/utilities/hardInfo/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      hardinfo
+      ;
+  };
+}

home/modules/cli/utilities/homeManager/default.nix

@@ -0,0 +1 @@
+{ programs.home-manager.enable = true; }

home/modules/cli/utilities/inetUtils/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      inetutils
+      ;
+  };
+}

home/modules/cli/utilities/libgenCli/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      libgen-cli
+      ;
+  };
+}

home/modules/cli/utilities/nyanCat/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      nyancat
+      ;
+  };
+}

home/modules/cli/utilities/parted/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      parted
+      ;
+  };
+}

home/modules/cli/utilities/pciUtils/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      pciutils
+      ;
+  };
+}

home/modules/cli/utilities/pinEntry/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      pinentry
+      ;
+  };
+}

home/modules/cli/utilities/playerCtl/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      playerctl
+      ;
+  };
+}

home/modules/cli/utilities/protonVpn/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      protonvpn-cli_2
+      ;
+  };
+}

home/modules/cli/utilities/speedTest/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      speedtest-rs
+      ;
+  };
+}

home/modules/cli/utilities/sshfs/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      sshfs
+      ;
+  };
+}

home/modules/cli/utilities/tokei/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      tokei
+      ;
+  };
+}

home/modules/cli/utilities/tomb/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      tomb
+      ;
+  };
+}

home/modules/cli/utilities/udiskie/default.nix

@@ -0,0 +1,7 @@
+{
+  services.udiskie = {
+    enable = true;
+    automount = true;
+    tray = "always";
+  };
+}

home/modules/cli/utilities/wget/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      wget
+      ;
+  };
+}

home/modules/cli/utilities/wine/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      wine
+      ;
+  };
+}

home/modules/cli/utilities/xdgUtils/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      xdg-utils
+      ;
+  };
+}

home/modules/cli/utilities/xdoTool/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      xdotool
+      ;
+  };
+}

home/modules/cli/utilities/yaBridge/default.nix

@@ -1,8 +1,10 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  ...
+}:
+{
   home.packages = builtins.attrValues {
-    inherit
+    inherit (pkgs)
-      (pkgs)
-      reaper
       yabridge
       ;
   };

home/modules/cli/utilities/yt-dlp/default.nix

@@ -0,0 +1,13 @@
+{
+  programs.yt-dlp =
+    let
+      configPath = ./config;
+      extraConfigPath = import (configPath + /extraConfig.nix);
+      settingsPath = import (configPath + /settings.nix);
+    in
+    {
+      enable = true;
+      extraConfig = extraConfigPath;
+      settings = settingsPath;
+    };
+}

home/modules/default.nix

@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}

home/modules/firefox/config/bookmarks/default.nix

@@ -1,32 +0,0 @@
-{flake, ...}: let
-  configPath = ./config;
-  flakedPath = configPath + /flake;
-
-  filterFiles = name: builtins.match ".*\\.nix$" name != null;
-
-  regularBookmarks = let
-    files = builtins.attrNames (builtins.readDir configPath);
-  in
-    builtins.foldl' (
-      emptyList: bookmarkFile:
-        emptyList ++ (import (configPath + "/${bookmarkFile}")).bookmarks
-    ) [] (builtins.filter filterFiles files);
-
-  flakedBookmarks = let
-    files = builtins.attrNames (builtins.readDir flakedPath);
-  in
-    builtins.foldl' (
-      emptyList: bookmarkFile:
-        emptyList
-        ++ (import (flakedPath + "/${bookmarkFile}") {
-          inherit
-            flake
-            ;
-        })
-        .bookmarks
-    ) [] (builtins.filter filterFiles files);
-
-  aggregatedBookmarks = regularBookmarks ++ flakedBookmarks;
-in {
-  bookmarks = aggregatedBookmarks;
-}

home/modules/firefox/config/search/config/flake/selfHosted.nix

@@ -1,25 +0,0 @@
-{flake, ...}: let
-  inherit
-    (flake.config.services)
-    instances
-    ;
-in {
-  "${instances.jellyfin.label}" = {
-    definedAliases = [
-      "@jf"
-    ];
-    icon = ./icons/jf.png;
-    urls = [
-      {template = "https://${instances.jellyfin.subdomain}.${instances.web.domains.url0}/web/#/search.html?query={searchTerms}";}
-    ];
-  };
-  "${instances.peertube.label}" = {
-    definedAliases = [
-      "@pt"
-    ];
-    icon = ./icons/pt.png;
-    urls = [
-      {template = "https://${instances.peertube.subdomain}.${instances.web.domains.url1}/search?search={searchTerms}";}
-    ];
-  };
-}

home/modules/firefox/config/settings/default.nix

@@ -1,14 +0,0 @@
-let
-  configPath = ./config;
-
-  aggregatedSettings = let
-    files = builtins.attrNames (builtins.readDir configPath);
-  in
-    builtins.foldl' (
-      emptySet: settingsFile:
-        emptySet // (import (configPath + "/${settingsFile}"))
-    ) {}
-    (builtins.filter (name: builtins.match ".*\\.nix$" name != null) files);
-in {
-  settings = aggregatedSettings;
-}

home/modules/firefox/default.nix

@@ -1,54 +0,0 @@
-{
-  pkgs,
-  flake,
-  ...
-}: let
-  inherit
-    (flake.config.people)
-    user0
-    ;
-in {
-  programs.firefox = let
-    configPath = ./config;
-    bookmarksPath = import (configPath + /bookmarks) {
-      inherit
-        flake
-        ;
-    };
-    extensionsPath = import (configPath + /extensions) {
-      inherit
-        pkgs
-        ;
-    };
-    searchPath = import (configPath + /search) {
-      inherit
-        flake
-        ;
-    };
-    settingsPath = import (configPath + /settings);
-    themesPath = import (configPath + /themes);
-  in {
-    enable = true;
-    package = pkgs.firefox;
-    profiles = {
-      ${user0} =
-        {
-          isDefault = true;
-          id = 0;
-        }
-        // bookmarksPath
-        // extensionsPath
-        // searchPath
-        // settingsPath
-        // themesPath;
-      testing =
-        {
-          isDefault = false;
-          id = 1;
-        }
-        // bookmarksPath
-        // searchPath
-        // themesPath;
-    };
-  };
-}

home/modules/freetube/default.nix

@@ -1,9 +0,0 @@
-{
-  programs.freetube = let
-    configPath = ./config;
-    settingsPath = import (configPath + /settings.nix);
-  in {
-    enable = true;
-    settings = settingsPath;
-  };
-}

home/modules/gui/apps/browsers/brave/config/extensions.nix

@@ -0,0 +1,8 @@
+[
+  { id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; } # uBlock Origin
+  { id = "cmpdlhmnmjhihmcfnigoememnffkimlk"; } # Catppuccin Macchiato
+  { id = "dlnpfhfhmkiebpnlllpehlmklgdggbhn"; } # Don't Close Last Tab
+  { id = "iplffkdpngmdjhlpjmppncnlhomiipha"; } # Unpaywall
+  { id = "mnjggcdmjocbbbhaepdhchncahnbgone"; } # SponsorBlock
+  { id = "ponfpcnoihfmfllpaingbgckeeldkhle"; } # YouTube Enhancer
+]

home/modules/gui/apps/browsers/brave/default.nix

@@ -0,0 +1,11 @@
+{
+  programs.brave =
+    let
+      configPath = ./config;
+      extensionsPath = import (configPath + /extensions.nix);
+    in
+    {
+      enable = true;
+      extensions = extensionsPath;
+    };
+}

home/modules/gui/apps/browsers/chrome/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      google-chrome
+      ;
+  };
+}

home/modules/gui/apps/browsers/default.nix

@@ -0,0 +1,10 @@
+let
+  content = builtins.readDir ./.;
+
+  dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content);
+
+  importList = map (name: ./. + "/${name}") dirContent;
+in
+{
+  imports = importList;
+}

home/modules/gui/apps/browsers/edge/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      microsoft-edge
+      ;
+  };
+}

home/modules/gui/apps/browsers/epiphany/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      epiphany
+      ;
+  };
+}

home/modules/gui/apps/browsers/firefox/config/bookmarks/config/development.nix

@@ -4,7 +4,8 @@ let
     "gitlab"
   ];
   gitlabURL = "https://gitlab.com/";
-in {
+in
+{
   name = "Development";
   toolbar = false;
   bookmarks = [
@@ -52,32 +53,26 @@ in {
     {
       name = "GitLab (Fallaryn)";
       url = "${gitlabURL}/fallaryn/dotfiles";
-      tags =
+      tags = [
-        [
+        "fallaryn"
-          "fallaryn"
+      ] ++ gitlabTags;
-        ]
-        ++ gitlabTags;
       keyword = "GitLab";
     }
     {
       name = "GitLab (Isaac)";
       url = "${gitlabURL}/askyourself/dotfiles";
-      tags =
+      tags = [
-        [
+        "isaac"
-          "isaac"
+        "askyourself"
-          "askyourself"
+      ] ++ gitlabTags;
-        ]
-        ++ gitlabTags;
       keyword = "GitLab";
     }
     {
       name = "GitLab (Nick)";
       url = "${gitlabURL}/upRootNutrition/dotfiles";
-      tags =
+      tags = [
-        [
+        "brbwaffles"
-          "brbwaffles"
+      ] ++ gitlabTags;
-        ]
-        ++ gitlabTags;
       keyword = "GitLab";
     }
     {

home/modules/gui/apps/browsers/firefox/config/bookmarks/default.nix

@@ -0,0 +1,34 @@
+{ flake, ... }:
+let
+  configPath = ./config;
+  flakedPath = configPath + /flake;
+
+  filterFiles = name: builtins.match ".*\\.nix$" name != null;
+
+  regularBookmarks =
+    let
+      files = builtins.attrNames (builtins.readDir configPath);
+    in
+    builtins.foldl' (
+      emptyList: bookmarkFile: emptyList ++ (import (configPath + "/${bookmarkFile}")).bookmarks
+    ) [ ] (builtins.filter filterFiles files);
+
+  flakedBookmarks =
+    let
+      files = builtins.attrNames (builtins.readDir flakedPath);
+    in
+    builtins.foldl' (
+      emptyList: bookmarkFile:
+      emptyList
+      ++ (import (flakedPath + "/${bookmarkFile}") {
+        inherit
+          flake
+          ;
+      }).bookmarks
+    ) [ ] (builtins.filter filterFiles files);
+
+  aggregatedBookmarks = regularBookmarks ++ flakedBookmarks;
+in
+{
+  bookmarks = aggregatedBookmarks;
+}

home/modules/gui/apps/browsers/firefox/config/extensions/default.nix

@@ -1,7 +1,7 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   extensions = builtins.attrValues {
-    inherit
+    inherit (pkgs.nur.repos.rycee.firefox-addons)
-      (pkgs.nur.repos.rycee.firefox-addons)
       bitwarden
       enhancer-for-youtube
       sponsorblock

home/modules/gui/apps/browsers/firefox/config/search/config/academic.nix

@@ -5,7 +5,7 @@
     ];
     icon = ./icons/sc.png;
     urls = [
-      {template = "https://sci-hub.ee/{searchTerms}";}
+      { template = "https://sci-hub.ee/{searchTerms}"; }
     ];
   };
   "Wikipedia" = {
@@ -13,7 +13,7 @@
       "@wi"
     ];
     urls = [
-      {template = "https://en.wikipedia.org/wiki/{searchTerms}";}
+      { template = "https://en.wikipedia.org/wiki/{searchTerms}"; }
     ];
   };
 }

home/modules/gui/apps/browsers/firefox/config/search/config/development.nix

@@ -5,7 +5,7 @@
     ];
     icon = ./icons/dn.png;
     urls = [
-      {template = "https://dnschecker.org/#A/{searchTerms}";}
+      { template = "https://dnschecker.org/#A/{searchTerms}"; }
     ];
   };
   "Hackage" = {
@@ -14,7 +14,7 @@
     ];
     icon = ./icons/ha.png;
     urls = [
-      {template = "https://hackage.haskell.org/packages/search?terms={searchTerms}";}
+      { template = "https://hackage.haskell.org/packages/search?terms={searchTerms}"; }
     ];
   };
   "Hoogle" = {
@@ -23,7 +23,7 @@
     ];
     icon = ./icons/ho.png;
     urls = [
-      {template = "https://www.stackage.org/lts-22.33/hoogle?q={searchTerms}";}
+      { template = "https://www.stackage.org/lts-22.33/hoogle?q={searchTerms}"; }
     ];
   };
   "Nix Home Manager" = {
@@ -32,7 +32,7 @@
     ];
     icon = ./icons/nx.png;
     urls = [
-      {template = "https://searchix.alanpearce.eu/options/home-manager/search?query={searchTerms}";}
+      { template = "https://searchix.alanpearce.eu/options/home-manager/search?query={searchTerms}"; }
     ];
   };
   "Nix Options" = {
@@ -41,7 +41,7 @@
     ];
     icon = ./icons/nx.png;
     urls = [
-      {template = "https://searchix.alanpearce.eu/options/nixos/search?query={searchTerms}";}
+      { template = "https://searchix.alanpearce.eu/options/nixos/search?query={searchTerms}"; }
     ];
   };
   "Nix Packages" = {
@@ -50,7 +50,7 @@
     ];
     icon = ./icons/nx.png;
     urls = [
-      {template = "https://searchix.alanpearce.eu/packages/nixpkgs/search?query={searchTerms}";}
+      { template = "https://searchix.alanpearce.eu/packages/nixpkgs/search?query={searchTerms}"; }
     ];
   };
   "Nix Wiki" = {
@@ -59,7 +59,7 @@
     ];
     icon = ./icons/nx.png;
     urls = [
-      {template = "https://nixos.wiki/index.php?search={searchTerms}";}
+      { template = "https://nixos.wiki/index.php?search={searchTerms}"; }
     ];
   };
 }

home/modules/gui/apps/browsers/firefox/config/search/config/flake/selfHosted.nix

@@ -0,0 +1,30 @@
+{ flake, ... }:
+let
+  inherit (flake.config.services)
+    instances
+    ;
+in
+{
+  "${instances.jellyfin.label}" = {
+    definedAliases = [
+      "@jf"
+    ];
+    icon = ./icons/jf.png;
+    urls = [
+      {
+        template = "https://${instances.jellyfin.subdomain}.${instances.web.domains.url0}/web/#/search.html?query={searchTerms}";
+      }
+    ];
+  };
+  "${instances.peertube.label}" = {
+    definedAliases = [
+      "@pt"
+    ];
+    icon = ./icons/pt.png;
+    urls = [
+      {
+        template = "https://${instances.peertube.subdomain}.${instances.web.domains.url1}/search?search={searchTerms}";
+      }
+    ];
+  };
+}

home/modules/gui/apps/browsers/firefox/config/search/config/gaming.nix

@@ -5,7 +5,7 @@
     ];
     icon = ./icons/pd.png;
     urls = [
-      {template = "https://www.protondb.com/search?q={searchTerms}";}
+      { template = "https://www.protondb.com/search?q={searchTerms}"; }
     ];
   };
 
@@ -15,7 +15,7 @@
     ];
     icon = ./icons/sd.png;
     urls = [
-      {template = "https://steamdb.info/search/?a=all&q={searchTerms}";}
+      { template = "https://steamdb.info/search/?a=all&q={searchTerms}"; }
     ];
   };
 }