Modularize code

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

users/common/default.nix

@@ -1,108 +1,31 @@
 { config, inputs, lib, pkgs, ... }:
 
-let
-  normalUsers = lib.attrsets.filterAttrs (name: config: config.isNormalUser) config.users.users;
-in
 {
   imports = [
     inputs.home-manager.nixosModules.default
     ./extra.nix
+
+    ./configs/persist
+    ./configs/sops
+
+    ./configs/firefox
+    ./configs/git
+    ./configs/gpg-agent
+    ./configs/hyprland
+    ./configs/kitty
+    ./configs/neovim
+    ./configs/stylix
+    ./configs/zsh
   ];
 
-  programs = {
-    hyprland.enable = true;
-    fuse.userAllowOther = true;
-    dconf.enable = true;
-  };
-
-  environment.sessionVariables = {
-    NIXOS_OZONE_WL = "1";
-    SOPS_AGE_KEY_FILE = "$HOME/.config/sops-nix/key.txt";
-  };
-
   home-manager = {
     extraSpecialArgs = { inherit inputs; };
     backupFileExtension = "bak";
-
     sharedModules = [{
-      imports = [
-        inputs.impermanence.nixosModules.home-manager.impermanence
-        inputs.sops-nix.homeManagerModules.sops
-        inputs.stylix.homeManagerModules.stylix
-        ./configs/stylix
-        ./configs/hyprland
-        ./configs/git
-        ./configs/zsh
-        ./configs/neovim
-        ./configs/kitty
-        ./configs/firefox
-        ./configs/gpg-agent
-      ];
-
-      home = {
-        packages = with pkgs; [
-          rofi-wayland
-          swww
-          pavucontrol
-        ];
-
-        stateVersion = "24.05";
-      };
-
+      home.stateVersion = "24.05";
       systemd.user.startServices = "sd-switch";
     }];
-
-    users = lib.attrsets.mapAttrs' (user: config: lib.attrsets.nameValuePair
-      (user)
-      (let
-        init = pkgs.pkgs.writeShellScriptBin "hyprland-init" ''
-          ${pkgs.swww}/bin/swww-daemon &> /tmp/swww.log &
-
-          while ! swww query &> /dev/null; do
-            sleep 0.1
-          done
-
-          ${pkgs.swww}/bin/swww img ${config.wallpaper}
-        '';
-        in
-        {
-        home.persistence."/persist${config.home}" = {
-          directories = [
-            "Documents"
-            "Downloads"
-            "Music"
-            "Pictures"
-            "Videos"
-            "Templates"
-            "VMs"
-            "git"
-            ".mozilla"
-            ".local/share/zsh"
-          ];
-          files = [
-            ".config/sops-nix/key.txt"
-          ];
-          allowOther = true;
-        };
-
-        sops.age.keyFile = "/persist${config.home}/.config/sops-nix/key.txt";
-
-        programs.git = {
-          userName = config.fullName;
-          userEmail = config.email;
-        };
-
-        stylix = {
-          image = config.wallpaper;
-          base16Scheme = config.base16Scheme;
-        };
-
-        wayland.windowManager.hyprland.settings.exec-once = "${init}/bin/hyprland-init";
-      })
-    ) normalUsers;
   };
 
-  systemd.tmpfiles.rules = [ "d /persist/home/ 0755 root root -" ] ++ 
-    lib.attrsets.mapAttrsToList ( user: config: "d /persist${config.home} 0700 ${user} users -" ) normalUsers ++ 
-    lib.attrsets.mapAttrsToList ( user: config: "d ${config.home}/.gnupg 0700 ${user} users -" ) normalUsers;
+  programs.dconf.enable = true;
 }