20 files changed, 162 insertions, 88 deletions
diff --git a/hm/soft/awww.nix b/hm/soft/awww.nix
deleted file mode 100644
index e807c9d..0000000
--- a/hm/soft/awww.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, lib, pkgs, inputs, ... }:
-let
-  cfg = config.szpont.hm.soft.awww;
-in
-{
-  options.szpont.hm.soft.awww.enable = lib.mkEnableOption "enables awww";
-
-  config = lib.mkIf cfg.enable {
-    services.swww = {
-      enable = true;
-      package = inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww;
-    };
-  };
-}
diff --git a/hm/soft/browser.nix b/hm/soft/browser.nix
new file mode 100644
index 0000000..023dce8
--- /dev/null
+++ b/hm/soft/browser.nix
@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.hm.soft.browser;
+in
+{
+  options.hm.soft.browser = {
+    enable = lib.mkEnableOption "browser configs";
+
+    librewolf.enable = lib.mkEnableOption "LibreWolf browser";
+    firefox.enable = lib.mkEnableOption "Firefox browser";
+    brave.enable = lib.mkEnableOption "Brave browser";
+  };
+  config = lib.mkIf cfg.enable (lib.mkMerge [
+    (lib.mkIf cfg.librewolf.enable {
+      programs.librewolf.enable = true;
+    })
+
+    (lib.mkIf cfg.firefox.enable {
+      programs.firefox.enable = true;
+    })
+
+    (lib.mkIf cfg.brave.enable {
+      home.packages = [ pkgs.brave ];
+    })
+  ]);
+}
diff --git a/hm/soft/easyeffects.nix b/hm/soft/easyeffects.nix
index beb9ad6..ab16736 100644
--- a/hm/soft/easyeffects.nix
+++ b/hm/soft/easyeffects.nix
@@ -1,10 +1,9 @@
 { config, lib, ... }:
 let
-  cfg = config.szpont.hm.soft.easyeffects;
+  cfg = config.hm.soft.easyeffects;
 in
 {
-  options.szpont.hm.soft.easyeffects.enable = lib.mkEnableOption "EasyEffects audio equalizer";
-
+  options.hm.soft.easyeffects.enable = lib.mkEnableOption "EasyEffects audio equalizer";
   config = lib.mkIf cfg.enable {
     services.easyeffects = {
       enable = true;
diff --git a/hm/soft/email.nix b/hm/soft/email.nix
new file mode 100644
index 0000000..d7ec9ea
--- /dev/null
+++ b/hm/soft/email.nix
@@ -0,0 +1,21 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.hm.soft.email;
+in
+{
+  options.hm.soft.email = {
+    enable = lib.mkEnableOption "email configs";
+
+    thunderbird.enable = lib.mkEnableOption "thunderbird config";
+    evolution.enable = lib.mkEnableOption "evolution config";
+  };
+  config = lib.mkIf cfg.enable (lib.mkMerge [
+    (lib.mkIf cfg.thunderbird.enable {
+      programs.librewolf.enable = true;
+    })
+
+    (lib.mkIf cfg.evolution.enable {
+      home.packages = [ pkgs.evolution ];
+    })
+  ]);
+}
diff --git a/hm/soft/fuzzel.nix b/hm/soft/fuzzel.nix
deleted file mode 100644
index 234aff7..0000000
--- a/hm/soft/fuzzel.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.szpont.hm.soft.fuzzel;
-in
-{
-  options.szpont.hm.soft.fuzzel.enable = lib.mkEnableOption "enables fuzzel";
-
-  config = lib.mkIf cfg.enable {
-    programs.fuzzel = {
-      enable = true;
-    };
-  };
-}
diff --git a/hm/soft/kdeconnect.nix b/hm/soft/kdeconnect.nix
new file mode 100644
index 0000000..07a5d9e
--- /dev/null
+++ b/hm/soft/kdeconnect.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.hm.soft.kdeconnect;
+in
+{
+  options.hm.soft.kdeconnect.enable = lib.mkEnableOption "enables kde connect integration and dolphin";
+
+  config = lib.mkIf cfg.enable {
+    services.kdeconnect.enable = true;
+
+    home.packages = [
+      pkgs.kdePackages.dolphin
+    ];
+  };
+}
diff --git a/hm/soft/kdenlive.nix b/hm/soft/kdenlive.nix
new file mode 100644
index 0000000..f2ca560
--- /dev/null
+++ b/hm/soft/kdenlive.nix
@@ -0,0 +1,10 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.hm.soft.kdenlive;
+in
+{
+  options.hm.soft.kdenlive.enable = lib.mkEnableOption "enables kdenlive editing";
+  config = lib.mkIf cfg.enable {
+    home.packages = [ pkgs.kdePackages.kdenlive ];
+  };
+}
diff --git a/hm/soft/gaming.nix b/hm/soft/mangohud.nix
index 5fc7095..eae15d5 100644
--- a/hm/soft/gaming.nix
+++ b/hm/soft/mangohud.nix
@@ -1,9 +1,9 @@
 { config, lib, ... }:
 let
-  cfg = config.szpont.hm.soft.gaming;
+  cfg = config.hm.soft.mangohud;
 in
 {
-  options.szpont.hm.soft.gaming.enable = lib.mkEnableOption "gaming hm config";
+  options.hm.soft.mangohud.enable = lib.mkEnableOption "mangohud hm config";
   config = lib.mkIf cfg.enable {
     programs.mangohud = {
       enable = true;
diff --git a/hm/soft/media.nix b/hm/soft/media.nix
index 0184957..abf3dff 100644
--- a/hm/soft/media.nix
+++ b/hm/soft/media.nix
@@ -1,10 +1,9 @@
 { config, lib, pkgs, ... }:
 let
-  cfg = config.szpont.hm.soft.media;
+  cfg = config.hm.soft.media;
 in
 {
-  options.szpont.hm.soft.media.enable = lib.mkEnableOption "media playback and processing tools";
-
+  options.hm.soft.media.enable = lib.mkEnableOption "media playback and processing tools";
   config = lib.mkIf cfg.enable {
     programs.mpv = {
       enable = true;
@@ -18,7 +17,6 @@ in
     };
 
     home.packages = with pkgs; [
-      # syncplay
       syncplay-nogui
       ffmpeg
       imagemagick
diff --git a/hm/soft/nixcord.nix b/hm/soft/nixcord.nix
index 4da3466..b0e3396 100644
--- a/hm/soft/nixcord.nix
+++ b/hm/soft/nixcord.nix
@@ -1,12 +1,11 @@
 { inputs, config, lib, pkgs, ... }:
 let
-  cfg = config.szpont.hm.soft.nixcord;
+  cfg = config.hm.soft.nixcord;
 in
 {
   imports = [ inputs.nixcord.homeModules.nixcord ];
 
-  options.szpont.hm.soft.nixcord.enable = lib.mkEnableOption "nixcord configuration";
-
+  options.hm.soft.nixcord.enable = lib.mkEnableOption "nixcord configuration";
   config = lib.mkIf cfg.enable {
     programs.nixcord = {
       enable = true;
diff --git a/hm/soft/obs.nix b/hm/soft/obs.nix
new file mode 100644
index 0000000..f0ae054
--- /dev/null
+++ b/hm/soft/obs.nix
@@ -0,0 +1,12 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.hm.soft.obs;
+in
+{
+  options.hm.soft.obs.enable = lib.mkEnableOption "enables obs video recording and clipping";
+  config = lib.mkIf cfg.enable {
+    programs.obs-studio = {
+      enable = true;
+    };
+  };
+}
diff --git a/hm/soft/obsidian.nix b/hm/soft/obsidian.nix
new file mode 100644
index 0000000..a840726
--- /dev/null
+++ b/hm/soft/obsidian.nix
@@ -0,0 +1,12 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.hm.soft.obsidian;
+in
+{
+  options.hm.soft.obsidian.enable = lib.mkEnableOption "enables obsidian notetaking";
+  config = lib.mkIf cfg.enable {
+    programs.obsidian = {
+      enable = true;
+    };
+  };
+}
diff --git a/hm/soft/onlyoffice.nix b/hm/soft/onlyoffice.nix
new file mode 100644
index 0000000..db7ad66
--- /dev/null
+++ b/hm/soft/onlyoffice.nix
@@ -0,0 +1,12 @@
+{ config, lib, ... }:
+let
+  cfg = config.hm.soft.onlyoffice;
+in
+{
+  options.hm.soft.onlyoffice.enable = lib.mkEnableOption "onlyoffice suite";
+  config = lib.mkIf cfg.enable {
+    programs.onlyoffice = {
+      enable = true;
+    };
+  };
+}
diff --git a/hm/soft/satty.nix b/hm/soft/satty.nix
deleted file mode 100644
index d3964a7..0000000
--- a/hm/soft/satty.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.szpont.hm.soft.satty;
-in
-{
-  options.szpont.hm.soft.satty.enable = lib.mkEnableOption "enables satty image editor";
-
-  config = lib.mkIf cfg.enable {
-    programs.satty = {
-      enable = true;
-    };
-  };
-}
diff --git a/hm/soft/soft.nix b/hm/soft/soft.nix
index eb975ea..191ada7 100644
--- a/hm/soft/soft.nix
+++ b/hm/soft/soft.nix
@@ -1,15 +1,19 @@
 { ... }:
 {
   imports = [
-    ./awww.nix
+    ./browser.nix
     ./easyeffects.nix
-    ./fuzzel.nix
-    ./gaming.nix
+    ./email.nix
+    ./kdeconnect.nix
+    ./kdenlive.nix
+    ./mangohud.nix
     ./media.nix
     ./nixcord.nix
-    ./satty.nix
+    ./obs.nix
+    ./obsidian.nix
+    ./onlyoffice.nix
     ./spicetify.nix
-    ./swayidle.nix
-    ./swaylock.nix
+    ./torrent.nix
+    ./vpn.nix
   ];
 }
diff --git a/hm/soft/spicetify.nix b/hm/soft/spicetify.nix
index 96c4d0d..59ed287 100644
--- a/hm/soft/spicetify.nix
+++ b/hm/soft/spicetify.nix
@@ -1,13 +1,12 @@
 { inputs, pkgs, config, lib, ... }:
 let
-  cfg = config.szpont.hm.soft.spicetify;
+  cfg = config.hm.soft.spicetify;
   spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
 in
 {
   imports = [ inputs.spicetify-nix.homeManagerModules.default ];
 
-  options.szpont.hm.soft.spicetify.enable = lib.mkEnableOption "spicetify config";
-
+  options.hm.soft.spicetify.enable = lib.mkEnableOption "spicetify config";
   config = lib.mkIf cfg.enable {
     programs.spicetify = {
       enable = true;
diff --git a/hm/soft/swayidle.nix b/hm/soft/swayidle.nix
deleted file mode 100644
index d06c74a..0000000
--- a/hm/soft/swayidle.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.szpont.hm.soft.swayidle;
-in
-{
-  options.szpont.hm.soft.swayidle.enable = lib.mkEnableOption "enables swayidle";
-
-  config = lib.mkIf cfg.enable {
-    services.swayidle = {
-      enable = true;
-    };
-  };
-}
diff --git a/hm/soft/swaylock.nix b/hm/soft/swaylock.nix
deleted file mode 100644
index a303e48..0000000
--- a/hm/soft/swaylock.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.szpont.hm.soft.swaylock;
-in
-{
-  options.szpont.hm.soft.swaylock.enable = lib.mkEnableOption "enables swaylock";
-
-  config = lib.mkIf cfg.enable {
-    programs.swaylock = {
-      enable = true;
-      package = pkgs.swaylock-effects;
-    };
-  };
-}
diff --git a/hm/soft/torrent.nix b/hm/soft/torrent.nix
new file mode 100644
index 0000000..63150c2
--- /dev/null
+++ b/hm/soft/torrent.nix
@@ -0,0 +1,12 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.hm.soft.torrent;
+in
+{
+  options.hm.soft.torrent.enable = lib.mkEnableOption "torrenting software / qbittorrent";
+  config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [
+      qbittorrent-enhanced
+    ];
+  };
+}
diff --git a/hm/soft/vpn.nix b/hm/soft/vpn.nix
new file mode 100644
index 0000000..7b83d57
--- /dev/null
+++ b/hm/soft/vpn.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.hm.soft.vpn;
+in
+{
+  options.hm.soft.vpn = {
+    enable = lib.mkEnableOption "enables vpn clients";
+
+    protonvpn.enable = lib.mkEnableOption "protonvpn";
+    mullvad.enable = lib.mkEnableOption "mullvad vpn";
+  };
+  config = lib.mkIf cfg.enable (lib.mkMerge [
+    (lib.mkIf cfg.mullvad.enable {
+      programs.mullvad-vpn = {
+        enable = true;
+      };
+    })
+    (lib.mkIf cfg.protonvpn.enable {
+      home.packages = [ pkgs.protonvpn-gui ];
+    })
+  ]);
+}