gaming, mail, fixes, and stuff!

modules/connectivity/default.nix

@@ -10,5 +10,6 @@
     ./internet
     ./bluetooth
     ./mounts
+    ./social-media
   ];
 }

modules/connectivity/internet/default.nix

@@ -10,5 +10,7 @@
     ./librewolf.nix
     ./zen-browser.nix
     ./tor.nix
+    ./mail.nix
+    ./rss.nix
   ];
 }

modules/connectivity/internet/mail.nix

@@ -0,0 +1,34 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  options = {
+    internet = {
+      mail.enable = lib.mkEnableOption "enable e-mail";
+      mail.providers.protonmail.enable = lib.mkEnableOption "enable protonmail";
+    };
+  };
+  config = {
+    programs = {
+      thunderbird = lib.mkIf config.internet.mail.enable {
+        enable = true;
+        profiles."default" = {
+          isDefault = true;
+        };
+      };
+    };
+    services = {
+      protonmail-bridge = lib.mkIf config.internet.mail.providers.protonmail.enable {
+        enable = true;
+        package = pkgs.protonmail-bridge;
+        extraPackages = with pkgs; [
+          gnome-keyring
+        ];
+      };
+    };
+  };
+}

modules/connectivity/internet/rss.nix

@@ -0,0 +1,19 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  options = {
+    internet = {
+      rss.enable = lib.mkEnableOption "enable rss";
+    };
+  };
+  config = {
+    home.packages = with pkgs; [
+      (lib.mkIf (config.internet.rss.enable) newsflash)
+    ];
+  };
+}

modules/default.nix

@@ -15,7 +15,6 @@
     ./gaming
     ./connectivity
     ./media
-    ./social-media
     ./server
   ];
 }

modules/defaults/desktop.nix

@@ -37,6 +37,11 @@
           enable = true;
         };
       };
+      mail = {
+        enable = true;
+        providers.protonmail.enable = true;
+      };
+      rss.enable = true;
     };
     bluetooth.enable = true;
     media = {

modules/defaults/laptop.nix

@@ -34,6 +34,11 @@
           enable = true;
         };
       };
+      mail = {
+        enable = true;
+        providers.protonmail.enable = true;
+      };
+      rss.enable = true;
     };
     bluetooth.enable = true;
     media = {

modules/desktop/hyprland.nix

@@ -52,7 +52,16 @@
       ];
       extraPortals = [
         inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland
+        pkgs.xdg-desktop-portal-xapp
+        pkgs.xdg-desktop-portal-gtk
+
       ];
+      config.common = {
+        "org.freedesktop.portal.OpenURI" = [
+          "*"
+          "hyprland"
+        ];
+      };
     };
     programs = {
       hyprlock = {
@@ -70,12 +79,12 @@
         monitor = config.desktop.hyprland.monitors;
         workspace = config.desktop.hyprland.workspaces.workspaces;
         exec-once = [
-          "hyprctl plugin load "
+          #"hyprctl plugin load "
           (lib.mkIf (config.desktop.walker.enable) "elephant")
           (lib.mkIf (config.desktop.waybar.enable) "waybar")
           (lib.mkIf (config.desktop.wallpaper.enable) "waypaper --restore --random")
-          (lib.mkIf (config.gaming.steam.enable) "adwaita-steam-gtk - i; steam --silent")
-
+          (lib.mkIf (config.gaming.steam.enable) "adwaita-steam-gtk -u; steam -silent")
+          (lib.mkIf (config.internet.mail.providers.protonmail.enable) "protonmail-bridge -n")
         ];
         "$mod" = "SUPER";
         "$shiftmod" = "SUPER_SHIFT";
@@ -98,8 +107,8 @@
           "$mod, S, togglespecialworkspace, magic"
           "$mod, O, exec, zen"
           "$shiftmod, S, movetoworkspace, special:magic"
-          "$controlmod, right, workspace, m-1"
-          "$controlmod, left, workspace, m+1"
+          "$controlmod, right, workspace, m+1"
+          "$controlmod, left, workspace, m-1"
           "$mod, mouse_down, workspace, m-1"
           "$mod, mouse_up, workspace, m+1"
           "$mod, left, movefocus, l"

modules/gaming/default.nix

@@ -8,6 +8,7 @@
 {
   imports = [
     ./steam.nix
-
+    ./modding.nix
+    ./minecraft.nix
   ];
 }

modules/gaming/minecraft.nix

@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  options = {
+    gaming = {
+      minecraft.enable = lib.mkEnableOption "enable minecraft";
+    };
+  };
+
+  config = lib.mkIf config.gaming.minecraft.enable {
+    home.packages = with pkgs; [
+      prismlauncher
+    ];
+  };
+}

modules/gaming/modding.nix

@@ -0,0 +1,21 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  options = {
+    gaming = {
+      modding.enable = lib.mkEnableOption "enable game modding";
+    };
+  };
+
+  config = lib.mkIf config.gaming.modding.enable {
+    home.packages = with pkgs; [
+      nexusmods-app-unfree
+      r2modman
+    ];
+  };
+}

modules/misc/default.nix

@@ -9,5 +9,6 @@
   imports = [
     ./bitwarden.nix
     ./syncthing.nix
+    ./secrets.nix
   ];
 }

modules/misc/secrets.nix

@@ -0,0 +1,17 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  home.packages = with pkgs; [
+    pass
+    gnome-keyring
+    seahorse
+    libsecret
+    gcr
+  ];
+  services.gnome-keyring.enable = true;
+}