diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index f5b0051..cc5fc80 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -36,10 +36,7 @@
   users.users.foglar = {
     isNormalUser = true;
     description = "foglar";
-    extraGroups = ["networkmanager" "wheel" "lp" "scanner" "docker"];
-    packages = with pkgs; [
-      #  thunderbird
-    ];
+    extraGroups = ["wheel"];
   };
 
   xdg.mime.enable = true;
diff --git a/nixos/desktop/hyprland/hyprland.nix b/nixos/desktop/hyprland/hyprland.nix
index c35fd88..08fd822 100644
--- a/nixos/desktop/hyprland/hyprland.nix
+++ b/nixos/desktop/hyprland/hyprland.nix
@@ -5,7 +5,7 @@
   ...
 }: {
   options = {
-    hyprland.enable =
+    desktop.hyprland.enable =
       lib.mkEnableOption "enable Hyprland module";
   };
 
@@ -16,14 +16,17 @@
     ./wlogout.nix
   ];
 
-  config = lib.mkIf config.hyprland.enable {
+  config = lib.mkIf config.desktop.hyprland.enable {
     waybar.enable = lib.mkDefault true;
     rofi.enable = lib.mkDefault true;
     wlogout.enable = lib.mkDefault true;
 
-    xdg.portal.enable =  true;
-    #xdg.portal.config = { commom;
-    xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
+    xdg.portal.enable = true;
+    xdg.portal.config = { common = {
+      default = ["gtk"];
+      };
+    };
+    xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-hyprland];
 
     services.network-manager-applet.enable = true;
     services.dunst.enable = true;
diff --git a/nixos/home.nix b/nixos/home.nix
index 976ce8e..4fd1405 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -8,7 +8,7 @@
     ./desktop/desktops.nix
   ];
 
-  hyprland.enable = true;
+  desktop.hyprland.enable = true;
   programming.enable = true;
   games.enable = true;
 
@@ -28,7 +28,7 @@
       s = "kitten ssh";
       diff = "diff --color";
       cd = "z";
-      #arduino-cli = "arduino-ports-enable ; arduino-cli";
+
       respawn = "clear; pfetch";
       l = "eza -lh  --icons=auto";
       mkdir = "mkdir -p";
diff --git a/nixos/system/packages/docker.nix b/nixos/system/packages/docker.nix
index 53635c6..4b45b3f 100644
--- a/nixos/system/packages/docker.nix
+++ b/nixos/system/packages/docker.nix
@@ -15,5 +15,7 @@
         setSocketVariable = true;
       };
     };
+
+    users.users.foglar.extraGroups = [ "docker" ];
   };
 }
diff --git a/nixos/system/packages/tor.nix b/nixos/system/packages/tor.nix
index 7c2b939..64000d6 100644
--- a/nixos/system/packages/tor.nix
+++ b/nixos/system/packages/tor.nix
@@ -8,14 +8,14 @@
     package.proxychains.enable = lib.mkEnableOption "Enable Proxychains";
   };
 
-  config =
-    lib.mkIf config.package.tor.enable {
+  config = lib.mkMerge [
+    (lib.mkIf config.package.tor.enable {
       services.tor = {
         enable = true;
       };
       services.tor.client.enable = true;
-    }
-    // lib.mkIf config.package.proxychains.enable {
+    })
+    (lib.mkIf config.package.proxychains.enable {
       programs.proxychains = {
         enable = true;
         chain.type = "dynamic";
@@ -28,5 +28,6 @@
           };
         };
       };
-    };
+    })
+  ];
 }
diff --git a/nixos/system/sys/network.nix b/nixos/system/sys/network.nix
index 4e0f309..a0296db 100644
--- a/nixos/system/sys/network.nix
+++ b/nixos/system/sys/network.nix
@@ -11,4 +11,6 @@
   hardware.bluetooth.enable = true; # enables support for Bluetooth
   hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
   services.blueman.enable = true;
+
+  users.users.foglar.extraGroups = [ "networkmanager" ];
 }
diff --git a/nixos/system/sys/printing.nix b/nixos/system/sys/printing.nix
index cdef052..549c74e 100644
--- a/nixos/system/sys/printing.nix
+++ b/nixos/system/sys/printing.nix
@@ -1,8 +1,4 @@
-{
-  pkgs,
-  ...
-}:
-{
+{pkgs, ...}: {
   # Printing
   services.printing.enable = true;
   services.printing.drivers = with pkgs; [gutenprint hplip splix];
@@ -26,4 +22,5 @@
   services.ipp-usb.enable = true;
   hardware.sane.extraBackends = [pkgs.hplipWithPlugin];
 
-}
\ No newline at end of file
+  users.users.foglar.extraGroups = ["lp" "scanner"];
+}