9 files changed, 79 insertions, 13 deletions
diff --git a/hm/env/awww.nix b/hm/env/awww.nix
new file mode 100644
index 0000000..d666742
--- /dev/null
+++ b/hm/env/awww.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, inputs, ... }:
+let
+  cfg = config.hm.env.awww;
+in
+{
+  options.hm.env.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/env/env.nix b/hm/env/env.nix
index 1c2c6d2..2f0fab1 100644
--- a/hm/env/env.nix
+++ b/hm/env/env.nix
@@ -3,6 +3,11 @@
   imports = [
     ./niri/niri.nix
 
+    ./awww.nix
+    ./fuzzel.nix
+    ./screenshot.nix
+    ./swayidle.nix
+    ./swaylock.nix
     ./theme.nix
     ./waybar.nix
   ];
diff --git a/hm/env/fuzzel.nix b/hm/env/fuzzel.nix
new file mode 100644
index 0000000..8d4462f
--- /dev/null
+++ b/hm/env/fuzzel.nix
@@ -0,0 +1,12 @@
+{ config, lib, ... }:
+let
+  cfg = config.hm.env.fuzzel;
+in
+{
+  options.hm.env.fuzzel.enable = lib.mkEnableOption "enables fuzzel";
+  config = lib.mkIf cfg.enable {
+    programs.fuzzel = {
+      enable = true;
+    };
+  };
+}
diff --git a/hm/env/niri/niri.nix b/hm/env/niri/niri.nix
index fddfcac..eb073e7 100644
--- a/hm/env/niri/niri.nix
+++ b/hm/env/niri/niri.nix
@@ -1,15 +1,14 @@
 { config, lib, pkgs, ... }:
 let
-  cfg = config.szpont.hm.env.niri;
+  cfg = config.hm.env.niri;
 in
 {
-  options.szpont.hm.env.niri.enable = lib.mkEnableOption "niri hm";
+  options.hm.env.niri.enable = lib.mkEnableOption "niri hm";
   config = lib.mkIf cfg.enable {
-
-    szpont.hm.soft = {
+    hm.env = {
       awww.enable = true;
       fuzzel.enable = true;
-      satty.enable = true;
+      screenshot.enable = true;
       swayidle.enable = true;
       swaylock.enable = true;
     };
@@ -87,8 +86,6 @@ in
     };
     home.packages = with pkgs; [
       qalculate-gtk
-      grim
-      slurp
     ];
   };
 }
diff --git a/hm/env/screenshot.nix b/hm/env/screenshot.nix
new file mode 100644
index 0000000..e61e3de
--- /dev/null
+++ b/hm/env/screenshot.nix
@@ -0,0 +1,16 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.hm.env.screenshot;
+in
+{
+  options.hm.env.screenshot.enable = lib.mkEnableOption "enables screenshot utilities";
+  config = lib.mkIf cfg.enable {
+    programs.satty = {
+      enable = true;
+    };
+    home.packages = with pkgs; [
+      grim
+      slurp
+    ];
+  };
+}
diff --git a/hm/env/swayidle.nix b/hm/env/swayidle.nix
new file mode 100644
index 0000000..41f64a2
--- /dev/null
+++ b/hm/env/swayidle.nix
@@ -0,0 +1,12 @@
+{ config, lib, ... }:
+let
+  cfg = config.hm.env.swayidle;
+in
+{
+  options.hm.env.swayidle.enable = lib.mkEnableOption "enables swayidle";
+  config = lib.mkIf cfg.enable {
+    services.swayidle = {
+      enable = true;
+    };
+  };
+}
diff --git a/hm/env/swaylock.nix b/hm/env/swaylock.nix
new file mode 100644
index 0000000..afde020
--- /dev/null
+++ b/hm/env/swaylock.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.hm.env.swaylock;
+in
+{
+  options.hm.env.swaylock.enable = lib.mkEnableOption "enables swaylock";
+  config = lib.mkIf cfg.enable {
+    programs.swaylock = {
+      enable = true;
+      package = pkgs.swaylock-effects;
+    };
+  };
+}
diff --git a/hm/env/theme.nix b/hm/env/theme.nix
index 54dd00b..761e394 100644
--- a/hm/env/theme.nix
+++ b/hm/env/theme.nix
@@ -1,14 +1,13 @@
 { config, lib, pkgs, ... }:
 let
-  cfg = config.szpont.hm.env.themes;
+  cfg = config.hm.env.themes;
 in
 {
-  options.szpont.hm.env.themes = {
+  options.hm.env.themes = {
     enable = lib.mkEnableOption "enables global theming";
     gtk.enable = lib.mkEnableOption "GTK theming";
     qt.enable = lib.mkEnableOption "QT theming";
   };
-
   config = lib.mkIf cfg.enable (lib.mkMerge [
     (lib.mkIf cfg.gtk.enable {
       gtk = {
diff --git a/hm/env/waybar.nix b/hm/env/waybar.nix
index 84ccea9..182a4fb 100644
--- a/hm/env/waybar.nix
+++ b/hm/env/waybar.nix
@@ -1,10 +1,9 @@
 { config, lib, ... }:
 let
-  cfg = config.szpont.hm.env.waybar;
+  cfg = config.hm.env.waybar;
 in
 {
-  options.szpont.hm.env.waybar.enable = lib.mkEnableOption "enables waybar";
-
+  options.hm.env.waybar.enable = lib.mkEnableOption "enables waybar";
   config = lib.mkIf cfg.enable {
     programs.waybar = {
       enable = true;