16 files changed, 10 insertions, 53 deletions
diff --git a/modules/chromium.nix b/modules/chromium.nix
deleted file mode 100644
index c73e8fa..0000000
--- a/modules/chromium.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  options.chromium.enable = lib.mkEnableOption "Enable chromium and setup with extension";
-  config = lib.mkIf config.chromium.enable {
-    programs.chromium = {
-      enable = true;
-      package = pkgs.ungoogled-chromium;
-      extensions = let
-        createChromiumExtensionFor = browserVersion: { id, sha256, version }: {
-          inherit id;
-          crxPath = builtins.fetchurl {
-            url = "https://clients2.google.com/service/update2/crx?response=redirect&acceptformat=crx2,crx3&prodversion=${browserVersion}&x=id%3D${id}%26installsource%3Dondemand%26uc";
-            name = "${id}.crx";
-            inherit sha256;
-          };
-          inherit version;
-        };
-        createChromiumExtension = createChromiumExtensionFor (lib.versions.major pkgs.ungoogled-chromium.version);
-      in [
-        (createChromiumExtension {
-          # ublock origin
-          id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";
-          sha256 = "sha256:0pdh1v0vx1d5vnl1zh7nbk6j1fh4k4hhwp1ljs203icn306lahsn";
-          version = "1.63.2";
-        })
-      ];
-    };
-  };
-}
diff --git a/modules/default.nix b/modules/default.nix
deleted file mode 100644
index 239ac18..0000000
--- a/modules/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ pkgs, lib, ... }: {
-  imports = [
-    ./git.nix
-    ./zsh.nix
-    ./foot.nix
-    ./sway.nix
-    ./tmux.nix
-    ./emacs.nix
-    ./waybar.nix
-    ./nextcloud.nix
-    ./spicetify.nix
-    ./zathura.nix
-    ./vscode.nix
-    ./chromium.nix
-    ./nixcord.nix
-    ./wezterm.nix
-    ./firefox.nix
-    ./nvf.nix
-    ./aerospace.nix
-    ./dunst.nix
-    ./gpg.nix
-  ];
-}
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
new file mode 100644
index 0000000..0eca7ff
--- /dev/null
+++ b/modules/home-manager/default.nix
@@ -0,0 +1,10 @@
+{ pkgs, lib, ... }: {
+  imports = [
+    ./git.nix
+    ./zsh.nix
+    ./tmux.nix
+    ./zathura.nix
+    ./vscode.nix
+    ./gpg.nix
+  ];
+}
diff --git a/modules/dunst.nix b/modules/home-manager/dunst.nix
index 87ae210..87ae210 100644
--- a/modules/dunst.nix
+++ b/modules/home-manager/dunst.nix
diff --git a/modules/firefox.nix b/modules/home-manager/firefox.nix
index 7d3dd4d..7d3dd4d 100644
--- a/modules/firefox.nix
+++ b/modules/home-manager/firefox.nix
diff --git a/modules/foot.nix b/modules/home-manager/foot.nix
index 69f6bf2..69f6bf2 100644
--- a/modules/foot.nix
+++ b/modules/home-manager/foot.nix
diff --git a/modules/git.nix b/modules/home-manager/git.nix
index cb87206..cb87206 100644
--- a/modules/git.nix
+++ b/modules/home-manager/git.nix
diff --git a/modules/gpg.nix b/modules/home-manager/gpg.nix
index 257295e..257295e 100644
--- a/modules/gpg.nix
+++ b/modules/home-manager/gpg.nix
diff --git a/modules/nixcord.nix b/modules/home-manager/nixcord.nix
index 0be180b..0be180b 100644
--- a/modules/nixcord.nix
+++ b/modules/home-manager/nixcord.nix
diff --git a/modules/spicetify.nix b/modules/home-manager/spicetify.nix
index 5d245d9..5d245d9 100644
--- a/modules/spicetify.nix
+++ b/modules/home-manager/spicetify.nix
diff --git a/modules/sway.nix b/modules/home-manager/sway.nix
index 16043ef..16043ef 100644
--- a/modules/sway.nix
+++ b/modules/home-manager/sway.nix
diff --git a/modules/tmux.nix b/modules/home-manager/tmux.nix
index e109375..e109375 100644
--- a/modules/tmux.nix
+++ b/modules/home-manager/tmux.nix
diff --git a/modules/vscode.nix b/modules/home-manager/vscode.nix
index 3dd2541..3dd2541 100644
--- a/modules/vscode.nix
+++ b/modules/home-manager/vscode.nix
diff --git a/modules/waybar.nix b/modules/home-manager/waybar.nix
index a3adb3b..a3adb3b 100644
--- a/modules/waybar.nix
+++ b/modules/home-manager/waybar.nix
diff --git a/modules/zathura.nix b/modules/home-manager/zathura.nix
index 592119b..592119b 100644
--- a/modules/zathura.nix
+++ b/modules/home-manager/zathura.nix
diff --git a/modules/zsh.nix b/modules/home-manager/zsh.nix
index e229c40..e229c40 100644
--- a/modules/zsh.nix
+++ b/modules/home-manager/zsh.nix