Merge branch 'dendritic' of git.jckrinsky.net:nixosconf into dendritic

2 files changed, 24 insertions, 10 deletions

diff --git a/modules/nixosModules/desktop/default.nix b/modules/nixosModules/desktop/default.nix
index 24ab8b7..1f8a2c8 100644
--- a/modules/nixosModules/desktop/default.nix
+++ b/modules/nixosModules/desktop/default.nix
@@ -24,8 +24,15 @@
       pkgs.ffmpeg-full
       pkgs.gimp3
       pkgs.libreoffice
+      pkgs.lxqt.lxqt-archiver
       pkgs.mpv
       pkgs.obsidian
+      ###### archiving
+      pkgs.p7zip
+      pkgs.zip
+      pkgs.unzip
+      pkgs.unrar
+      ######
       pkgs.qbittorrent
       pkgs.thunderbird
       pkgs.ungoogled-chromium
diff --git a/modules/nixosModules/desktop/gaming.nix b/modules/nixosModules/desktop/gaming.nix
index 7314d8e..7b2016d 100644
--- a/modules/nixosModules/desktop/gaming.nix
+++ b/modules/nixosModules/desktop/gaming.nix
@@ -1,24 +1,31 @@
-{self, ...}: {
+{inputs, ...}: {
   flake.nixosModules.gaming = {
     pkgs,
     lib,
     ...
   }: {
-    programs = {
-      steam = {
-        enable = true;
-        protontricks.enable = true;
-        extest.enable = true;
+    imports = [inputs.nix-flatpak.nixosModules.nix-flatpak];
 
-        extraCompatPackages = with pkgs; [
-          proton-ge-bin
-        ];
-      };
+    programs.steam = {
+      enable = true;
+      protontricks.enable = true;
+      extest.enable = true;
+
+      extraCompatPackages = with pkgs; [
+        proton-ge-bin
+      ];
     };
 
     environment.systemPackages = with pkgs; [
       prismlauncher
       heroic
     ];
+
+    services.flatpak = {
+      enable = lib.mkDefault true;
+      packages = [
+        "org.vinegarhq.Sober"
+      ];
+    };
   };
 }