Merge branch 'main' of https://git.marty.tf/marty/config.nix

modules/desktop/hyprland.nix

@@ -15,7 +15,7 @@
           default = [
             ",preferred,auto,1"
           ];
-          description = ''declare monitors'';
+          description = "declare monitors";
         };
         workspaces = {
           workspaces = lib.mkOption {
@@ -32,11 +32,11 @@
                 ) config.desktop.hyprland.workspaces.amount
               )
             );
-            description = ''declare workspace'';
+            description = "declare workspace";
           };
           amount = lib.mkOption {
             default = 9;
-            description = ''declare workspace amount'';
+            description = "declare workspace amount";
           };
         };
         numlock = lib.mkEnableOption "numlock by default";
@@ -78,6 +78,11 @@
       settings = {
         monitor = config.desktop.hyprland.monitors;
         workspace = config.desktop.hyprland.workspaces.workspaces;
+        env = [
+          "XDG_CURRENT_DESKTOP,Hyprland"
+          "XDG_SESSION_TYPE,wayland"
+          "XDG_SESSION_DESKTOP,Hyprland"
+        ];
         exec-once = [
           #"hyprctl plugin load "
           (lib.mkIf (config.desktop.walker.enable) "elephant")
@@ -87,6 +92,7 @@
           (lib.mkIf (config.desktop.wallpaper.enable) "waypaper --restore --random")
           (lib.mkIf (config.gaming.steam.enable) "adwaita-steam-gtk -u; steam -silent")
           (lib.mkIf (config.internet.mail.providers.protonmail.enable) "protonmail-bridge -n")
+          "echo $HYPRLAND_INSTANCE_SIGNATURE > ~/.config/hypr/instance_signature"
         ];
         "$mod" = "SUPER";
         "$shiftmod" = "SUPER_SHIFT";

modules/development/default.nix

@@ -11,6 +11,10 @@
     ./vscodium.nix
     ./python.nix
     ./godot.nix
-
+    ./openssl.nix
+  ];
+  home.packages = with pkgs; [
+    bc
+    imagemagick
   ];
 }

modules/development/openssl.nix

@@ -0,0 +1,12 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  home.packages = with pkgs; [
+    openssl
+  ];
+}

modules/gaming/steam.nix

@@ -14,7 +14,6 @@
 
   config = lib.mkIf config.gaming.steam.enable {
     home.packages = with pkgs; [
-      steam
       adwsteamgtk
     ];
   };

modules/media/video.nix

@@ -13,6 +13,8 @@
         mpv.enable = lib.mkEnableOption "enable mpv";
         kdenlive.enable = lib.mkEnableOption "enable kdenlive";
         tsukimi.enable = lib.mkEnableOption "enable tsukimi (jellyfin client)";
+        jellyfin.enable = lib.mkEnableOption "enable jellyin (jellyfin client)";
+        pipeline.enable = lib.mkEnableOption "enable pipeline (you/peertube client)";
       };
     };
   };
@@ -22,10 +24,14 @@
       kdenlive.enable = lib.mkDefault true;
       mpv.enable = lib.mkDefault true;
       tsukimi.enable = lib.mkDefault true;
+      jellyfin.enable = lib.mkDefault true;
+      pipeline.enable = lib.mkDefault true;
     };
     home.packages = with pkgs; [
       (lib.mkIf (config.media.video.kdenlive.enable) kdePackages.kdenlive)
       (lib.mkIf (config.media.video.tsukimi.enable) tsukimi)
+      (lib.mkIf (config.media.video.jellyfin.enable) jellyfin-desktop)
+      (lib.mkIf (config.media.video.pipeline.enable) pipeline)
     ];
     programs = {
       mpv = lib.mkIf config.media.video.mpv.enable {