feat: removed a bunch of flake inputs

config/default.nix

@@ -56,6 +56,7 @@ let
       subdomain = stringType;
       label = stringType;
       name = stringType;
+      hostname = stringType;
       domains = genOptions stringType "url";
       dns = genOptions stringType "provider";
       localhost = genOptions stringType "address";

config/instances/config/hledger.nix

@@ -1,18 +0,0 @@
-{ instancesFunctions }:
-let
-  inherit (instancesFunctions)
-    dummy
-    ;
-  hledgerLabel = "Hledger";
-  hledgerName = "hledger";
-in
-{
-  label = hledgerLabel;
-  name = hledgerName;
-  paths = {
-    path0 = "/mnt/media/storage/${hledgerLabel}";
-  };
-  ports = {
-    port0 = 5000;
-  };
-}

config/instances/config/nginx.nix

@@ -1,17 +0,0 @@
-{instancesFunctions}: let
-  inherit
-    (instancesFunctions)
-    dummy
-    ;
-
-  nginxLabel = "Ngnix";
-  nginxName = "nginx";
-in {
-  name = nginxName;
-  label = nginxLabel;
-  email = dummy;
-  ports = {
-    port0 = 8080; # HTTP
-    port1 = 8443; # HTTPS
-  };
-}

config/instances/config/postfix.nix

@@ -0,0 +1,27 @@
+{ instancesFunctions }:
+let
+  inherit (instancesFunctions)
+    domain3
+    servicePath
+    sslPath
+    sopsPath
+    ;
+
+  postfixLabel = "Postfix";
+  postfixName = "postfix";
+in
+{
+  label = postfixLabel;
+  name = postfixName;
+  sops = {
+    path0 = "${sopsPath}/${postfixName}";
+  };
+  subdomain = postfixName;
+  paths = {
+    path0 = "${servicePath}/${postfixLabel}";
+  };
+  ssl = {
+    cert = "${sslPath}/${domain3}/fullchain.pem";
+    key = "${sslPath}/${domain3}/key.pem";
+  };
+}

config/instances/config/smtp.nix

@@ -0,0 +1,13 @@
+{ instancesFunctions }:
+let
+  inherit (instancesFunctions)
+    dummy
+    ;
+in
+{
+  hostname = "mail.smtp2go.com";
+  name = dummy;
+  ports = {
+    port0 = 2525;
+  };
+}

config/instances/default.nix

@@ -12,20 +12,26 @@ let
     sopsPath = "/var/lib/secrets";
     sslPath = "/var/lib/acme";
     varLib = "/var/lib";
-    dummy = [];
+    dummy = "";
   };
 
-  instances = builtins.listToAttrs (map (name: {
+  instances = builtins.listToAttrs (
-      name = builtins.substring 0 (builtins.stringLength name - 4) name;
+    map
-      value = import (configPath + "/${name}") {
+      (name: {
-        inherit
+        name = builtins.substring 0 (builtins.stringLength name - 4) name;
-          instancesFunctions
+        value = import (configPath + "/${name}") {
-          ;
+          inherit
-      };
+            instancesFunctions
-    })
+            ;
-    (builtins.filter (name:
+        };
-      builtins.match ".*\\.nix$" name != null) (builtins.attrNames
+      })
-      (builtins.readDir configPath))));
+      (
-in {
+        builtins.filter (name: builtins.match ".*\\.nix$" name != null) (
+          builtins.attrNames (builtins.readDir configPath)
+        )
+      )
+  );
+in
+{
   instances = instances;
 }

flake.nix

@@ -11,14 +11,15 @@
       url = "github:hercules-ci/flake-parts";
       inputs.nixpkgs-lib.follows = "nixpkgs";
     };
+    systems.url = "github:nix-systems/x86_64-linux";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    ngipkgs.url = "github:ngi-nix/ngipkgs";
     ghostty = {
       url = "github:ghostty-org/ghostty";
     };
-    ngipkgs.url = "github:ngi-nix/ngipkgs";
     nur = {
       url = "github:nix-community/NUR";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -27,7 +28,6 @@
       url = "github:cachix/pre-commit-hooks.nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    systems.url = "github:nix-systems/x86_64-linux";
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -37,30 +37,6 @@
       url = "github:helix-editor/helix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    hyprland = {
-      url = "github:hyprwm/Hyprland";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    hyprland-portal = {
-      url = "github:hyprwm/xdg-desktop-portal-hyprland";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    hypridle = {
-      url = "github:hyprwm/hypridle";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    wpaperd = {
-      url = "github:danyspin97/wpaperd";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    waybar = {
-      url = "github:Alexays/Waybar";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    direnv = {
-      url = "github:direnv/direnv";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs =

home/default.nix

@@ -50,7 +50,7 @@ in
             messaging
             sharing
             tools
-            desktop
+            hypr
             ;
         };
       };

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

@@ -1,12 +1,6 @@
-{
-  flake,
-  pkgs,
-  ...
-}:
 {
   programs.direnv = {
     enable = true;
-    package = flake.inputs.direnv.packages.${pkgs.system}.default;
     nix-direnv.enable = true;
   };
 }

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

@@ -64,16 +64,16 @@ in
       ];
       keyword = instances.forgejo.label;
     }
-    {
+    # {
-      name = instances.hledger.label;
+    #   name = instances.hledger.label;
-      url = "http://localhost.${builtins.toString instances.hledger.ports.port0}";
+    #   url = "http://localhost.${builtins.toString instances.hledger.ports.port0}";
-      tags = [
+    #   tags = [
-        instances.hledger.name
+    #     instances.hledger.name
-        "hledger"
+    #     "hledger"
-        "finances"
+    #     "finances"
-      ];
+    #   ];
-      keyword = instances.hledger.label;
+    #   keyword = instances.hledger.label;
-    }
+    # }
     {
       name = "${instances.jellyfin.label} (Internet)";
       url = "https://${instances.jellyfin.name}.${instances.web.domains.url0}";

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

@@ -2,9 +2,18 @@
   name = "Tools";
   toolbar = false;
   bookmarks = [
+    {
+      name = "Mullvad";
+      url = "https://mullvad.net";
+      tags = [
+        "mullvad"
+        "vpn"
+      ];
+      keyword = "Mull";
+    }
     {
       name = "Cyanophage Layout Analyzer";
-      url = "https://cyanophage.github.io/";
+      url = "https://cyanophage.github.io";
       tags = [
         "cyanophage"
         "keyboard"
@@ -12,6 +21,15 @@
       ];
       keyword = "Layout";
     }
+    {
+      name = "Smtp2Go";
+      url = "https://app-us.smtp2go.com/dashboard/main";
+      tags = [
+        "smtp"
+        "email"
+      ];
+      keyword = "Smtp";
+    }
     {
       name = "Oryx";
       url = "https://configure.zsa.io/moonlander";

home/modules/gui/apps/browsers/firefox/config/themes/config/userChrome.css

@@ -19,7 +19,7 @@
 }
 
 .titlebar-buttonbox-container {
-	display: none !important;
+	display: visible !important;
 }
 
 
@@ -91,8 +91,8 @@
 #forward-button[disabled="true"] {
 	display: none !important;
 }
-.personalize-button { 
+.personalize-button {
-	display: none !important; 
+	display: none !important;
 }
 
 .tab-close-button {

home/modules/gui/apps/media/llms/alpaca/default.nix

@@ -5,8 +5,7 @@
 {
   home.packages = builtins.attrValues {
     inherit (pkgs)
-      catppuccin
+      alpaca
-      catppuccin-gtk
       ;
   };
 }

home/modules/gui/apps/media/llms/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/media/llms/oterm/default.nix

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

home/modules/gui/apps/tools/flameshot/default.nix

@@ -1,4 +1,5 @@
 { pkgs, ... }:
+
 let
   flameshotGrim = pkgs.flameshot.overrideAttrs (oldAttrs: {
     src = pkgs.fetchFromGitHub {
@@ -20,10 +21,15 @@ in
     package = flameshotGrim;
     settings = {
       General = {
-        disabledTrayIcon = true;
+        disabledTrayIcon = false;
         showStartupLaunchMessage = false;
-        disabledGrimWarning = true;
+        # disabledGrimWarning = false;
       };
     };
   };
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      # flameshot
+      ;
+  };
 }

home/modules/gui/apps/tools/mullvad/default.nix

@@ -0,0 +1,13 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      # mullvad
+      mullvad-closest
+      mullvad-vpn
+      ;
+  };
+}

home/modules/gui/desktop/gnome/default.nix

@@ -0,0 +1,24 @@
+{ pkgs, ... }:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      gnome-connections
+      gnome-tweaks
+      gnome-shell-extensions
+      gnome-remote-desktop
+      ulauncher
+      ;
+    inherit (pkgs.gnomeExtensions)
+      tiling-shell
+      keep-awake
+      notification-banner-reloaded
+      no-overview
+      wallpaper-slideshow
+      dash-to-panel
+      just-perfection
+      appindicator
+      tiling-assistant
+      start-overlay-in-application-view
+      ;
+  };
+}

home/modules/gui/desktop/hypr/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/desktop/hypr/hypridle/default.nix

@@ -1,8 +1,3 @@
-{
-  flake,
-  pkgs,
-  ...
-}:
 let
   configPath = ./config;
   settingsPath = import (configPath + /settings.nix);
@@ -10,7 +5,6 @@ in
 {
   services.hypridle = {
     enable = true;
-    package = flake.inputs.hypridle.packages.${pkgs.system}.hypridle;
     settings = settingsPath;
   };
 }

home/modules/gui/desktop/hypr/hyprland/default.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   flake,
   config,
   ...
@@ -29,7 +28,6 @@ in
 {
   wayland.windowManager.hyprland = {
     enable = true;
-    package = flake.inputs.hyprland.packages.${pkgs.system}.hyprland;
     xwayland.enable = true;
     systemd.enable = false;
     settings = configImports;

home/modules/gui/desktop/hypr/waybar/default.nix

@@ -12,7 +12,6 @@ in
 {
   programs.waybar = {
     enable = true;
-    package = flake.inputs.waybar.packages.${pkgs.system}.default;
     settings = settingsPath;
     style = stylePath;
   };

home/modules/gui/desktop/hypr/wpaperd/default.nix

@@ -1,12 +1,6 @@
-{
-  flake,
-  pkgs,
-  ...
-}:
 {
   programs.wpaperd = {
     enable = true;
-    package = flake.inputs.wpaperd.packages.${pkgs.system}.default;
     settings = {
       "default" = {
         path = "~/Files/Projects/dotfiles/home/modules/gui/desktop/wpaperd/wallpaper";