diff --git a/hosts/nixos/home/partials/apps.nix b/hosts/nixos/home/partials/apps.nix
new file mode 100644
index 0000000..51a1757
--- /dev/null
+++ b/hosts/nixos/home/partials/apps.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    pods
+    zed-editor
+  ];
+}
diff --git a/hosts/nixos/home/partials/firefox.nix b/hosts/nixos/home/partials/firefox.nix
index a35356f..d3874b0 100644
--- a/hosts/nixos/home/partials/firefox.nix
+++ b/hosts/nixos/home/partials/firefox.nix
@@ -2,9 +2,7 @@
 
 {
   programs.firefox = {
-
     enable = true;
-
     policies = {
       ExtensionSettings = {
         "uBlock0@raymondhill.net" = {
@@ -15,7 +13,6 @@
         };
       };
     };
-
     profiles.alistreaza = {
       settings = {
         # Disable some telemetry
@@ -61,7 +58,6 @@
         "sidebar.main.tools" = "history,passwords";
       };
     };
-
   };
   xdg.mimeApps.defaultApplications = {
     "text/html" = [ "firefox.desktop" ];
diff --git a/hosts/nixos/home/partials/gnome/dconf.nix b/hosts/nixos/home/partials/gnome/dconf.nix
index 2997f70..8c2e2c5 100644
--- a/hosts/nixos/home/partials/gnome/dconf.nix
+++ b/hosts/nixos/home/partials/gnome/dconf.nix
@@ -9,7 +9,7 @@ with lib.hm.gvariant;
     papirus-icon-theme
     gnomeExtensions.paperwm
     gnomeExtensions.app-hider
-    gnomeExtensions.dash-to-dock
+    gnomeExtensions.dash-to-panel
   ];
 
   dconf = {
@@ -30,7 +30,7 @@ with lib.hm.gvariant;
         enabled-extensions = with pkgs.gnomeExtensions; [
           paperwm.extensionUuid
           app-hider.extensionUuid
-          dash-to-dock.extensionUuid
+          dash-to-panel.extensionUuid
         ];
       };
 
@@ -60,25 +60,36 @@ with lib.hm.gvariant;
         picture-uri-dark = "file://" + ./walls.jpg;
       };
 
-      "org/gnome/shell/extensions/dash-to-dock" = {
-        apply-custom-theme = false;
-        transparency-mode = "FIXED";
-        background-opacity = 0.45;
-        background-color = "rgb(0,0,0)";
-        custom-background-color = false;
-        custom-theme-shrink = false;
-        dash-max-icon-size = 35;
-        disable-overview-on-startup = true;
-        dock-fixed = true;
-        dock-position = "LEFT";
-        extend-height = true;
-        icon-size-fixed = true;
-        show-apps-at-top = false;
-        show-running = true;
-        show-favorites = true;
-        show-mounts = false;
-        show-trash = false;
-        show-windows-preview = false;
+      "org/gnome/shell/extensions/dash-to-panel" = {
+        prefs-opened = false;
+
+        isolate-monitors = true;
+        isolate-workspaces = true;
+
+        appicon-margin = 2;
+        appicon-padding = 12;
+
+        trans-panel-opacity = 0.75;
+
+        trans-use-border = true;
+        trans-use-custom-opacity = true;
+
+        dot-color-dominant = true;
+        dot-color-override = false;
+        dot-color-unfocused-different = false;
+
+        dot-position = "BOTTOM";
+        dot-style-focused = "METRO";
+        dot-style-unfocused = "SQUARES";
+
+        panel-top-bottom-margins = 0;
+        panel-top-bottom-padding = 0;
+
+        focus-highlight = false;
+        focus-highlight-dominant = true;
+
+        highlight-appicon-hover = true;
+        hide-overview-on-startup = true;
       };
 
       "org/gnome/shell/extensions/paperwm" = {
diff --git a/hosts/nixos/home/users/alistreaza.nix b/hosts/nixos/home/users/alistreaza.nix
index dcde754..7b6fa78 100644
--- a/hosts/nixos/home/users/alistreaza.nix
+++ b/hosts/nixos/home/users/alistreaza.nix
@@ -22,7 +22,6 @@
 
     # Code editor
     home.env.nix.enable = true;
-    home.ide.zed.enable = true;
 
     # The state version is required and should stay at the version you
     # originally installed.
diff --git a/hosts/nixos/system/hardware-configuration.nix b/hosts/nixos/system/hardware-configuration.nix
index 76e113d..9b10d9d 100644
--- a/hosts/nixos/system/hardware-configuration.nix
+++ b/hosts/nixos/system/hardware-configuration.nix
@@ -14,18 +14,18 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/da148e71-90a0-4307-b820-42474191a207";
+    { device = "/dev/disk/by-uuid/6002ba98-6ce8-49d5-a501-9c2500343b2a";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/8AF0-72B6";
+    { device = "/dev/disk/by-uuid/E9B0-43BF";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/d892a0d1-4025-4391-95e0-949c627f4ce7"; }
+    [ { device = "/dev/disk/by-uuid/b442da0b-8a3e-4f05-b13f-aec8a89917be"; }
     ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
diff --git a/hosts/nixos/system/os.nix b/hosts/nixos/system/os.nix
index 5ae129a..f042af1 100755
--- a/hosts/nixos/system/os.nix
+++ b/hosts/nixos/system/os.nix
@@ -8,8 +8,7 @@
   os.audio.pipewire.enable = true;
 
   # Networks services
-  os.networks.dns.enable = true;
-  os.networks.manager.enable = true;
+  os.networking.enable = true;
 
   # Printing and sharing
   os.networks.samba.enable = true;
@@ -23,7 +22,6 @@
   os.virtualisation.podman.enable = true;
 
   # Terminal
-  os.flatpak.enable = true;
   programs.ssh.enableAskPassword = false; # No-window git push fix
 
   # Shells configurations
diff --git a/hosts/nixos/system/partials/apps.nix b/hosts/nixos/system/partials/apps.nix
index f8e667c..5fb51b7 100644
--- a/hosts/nixos/system/partials/apps.nix
+++ b/hosts/nixos/system/partials/apps.nix
@@ -1,6 +1,6 @@
 { ... }:
 {
-  
+  os.flatpak.enable = true;
   services.flatpak.packages = [
     "io.github.flattool.Warehouse"
   ];
diff --git a/hosts/nixos/system/partials/users.nix b/hosts/nixos/system/partials/users.nix
index 5e2b378..ce3c5bf 100644
--- a/hosts/nixos/system/partials/users.nix
+++ b/hosts/nixos/system/partials/users.nix
@@ -4,10 +4,7 @@
   users.users = {
     alistreaza = {
       isNormalUser = true;
-      extraGroups = [
-        "wheel"
-        "podman"
-      ];
+      extraGroups = [ "wheel" ];
     };
   };
 }
diff --git a/modules/system/nixos/graphics/cuda.nix b/modules/system/nixos/graphics/cuda.nix
index bf3956c..0ef0b19 100644
--- a/modules/system/nixos/graphics/cuda.nix
+++ b/modules/system/nixos/graphics/cuda.nix
@@ -24,13 +24,5 @@ in
       nccl
     ];
 
-    environment.variables = {
-      CUDA_PATH = "${pkgs.cudatoolkit}";
-      LD_LIBRARY_PATH = "${pkgs.linuxPackages.nvidia_x11}/lib:$LD_LIBRARY_PATH";
-      EXTRA_LDFLAGS = "-L/lib -L${pkgs.linuxPackages.nvidia_x11}/lib";
-      EXTRA_CCFLAGS = "-I/usr/include";
-    };
-
   };
-
 }
diff --git a/modules/system/nixos/networks/manager.nix b/modules/system/nixos/networks/manager.nix
deleted file mode 100644
index 5b80476..0000000
--- a/modules/system/nixos/networks/manager.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ lib, config, ... }:
-with lib;
-let
-  cfg = config.os.networks.manager;
-in
-{
-  options.os.networks.manager = {
-    enable = mkEnableOption "System networks manager service";
-  };
-  config = mkIf cfg.enable {
-
-    networking.networkmanager.enable = true;
-
-  };
-}
diff --git a/modules/system/nixos/networks/dns.nix b/modules/system/nixos/networks/networking.nix
similarity index 57%
rename from modules/system/nixos/networks/dns.nix
rename to modules/system/nixos/networks/networking.nix
index 220bee8..1d1a566 100644
--- a/modules/system/nixos/networks/dns.nix
+++ b/modules/system/nixos/networks/networking.nix
@@ -1,11 +1,11 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.os.networks.dns;
+  cfg = config.os.networking;
 in
 {
-  options.os.networks.dns = {
-    enable = mkEnableOption "System dns service";
+  options.os.networking = {
+    enable = mkEnableOption "System networks manager service";
   };
   config = mkIf cfg.enable {
 
@@ -17,5 +17,7 @@ in
       openFirewall = true;
     };
 
+    networking.networkmanager.enable = true;
+
   };
 }
diff --git a/modules/system/nixos/networks/printing.nix b/modules/system/nixos/networks/printing.nix
index 86e7eb7..95f4ae6 100644
--- a/modules/system/nixos/networks/printing.nix
+++ b/modules/system/nixos/networks/printing.nix
@@ -1,4 +1,5 @@
 {
+  pkgs,
   lib,
   config,
   ...
@@ -6,6 +7,8 @@
 with lib;
 let
   cfg = config.os.networks.printing;
+  all = builtins.attrNames config.users.users;
+  users = builtins.filter (user: config.users.users.${user}.isNormalUser == true) all;
 in
 {
   options.os.networks.printing = {
@@ -15,7 +18,17 @@ in
 
     services.printing = {
       enable = true;
+      startWhenNeeded = true;
+      drivers = with pkgs; [ hplip ];
     };
 
+    hardware.sane = {
+      enable = true;
+      extraBackends = with pkgs; [ sane-airscan ];
+    };
+
+    users.groups.lp.members = users;
+    users.groups.scanner.members = users;
+
   };
 }
diff --git a/modules/system/nixos/shells/gnome.nix b/modules/system/nixos/shells/gnome.nix
deleted file mode 100644
index c93344d..0000000
--- a/modules/system/nixos/shells/gnome.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-with lib;
-let
-  cfg = config.os.gnome.shell;
-in
-{
-  options.os.gnome.shell = {
-    enable = mkEnableOption "System gnome shell service";
-  };
-  config = mkIf cfg.enable {
-
-    services.displayManager.gdm.enable = true;
-    services.desktopManager.gnome.enable = true;
-
-    services.gnome.games.enable = false;
-    services.gnome.core-apps.enable = false;
-    services.gnome.core-developer-tools.enable = false;
-
-    environment = {
-
-      gnome.excludePackages = with pkgs; [
-        gnome-tour
-        gnome-user-docs
-      ];
-
-      systemPackages = with pkgs; [
-
-        # Gnome terminal
-        ghostty
-
-        # Gnome Extensions
-        gnomeExtensions.paperwm
-        gnomeExtensions.app-hider
-        gnomeExtensions.dash-to-dock
-
-      ];
-    };
-
-  };
-}
diff --git a/modules/system/nixos/shells/shell.nix b/modules/system/nixos/shells/shell.nix
index 892c0cc..12b2a6a 100644
--- a/modules/system/nixos/shells/shell.nix
+++ b/modules/system/nixos/shells/shell.nix
@@ -33,10 +33,10 @@ in
       systemPackages =
         with pkgs;
         [ nautilus ]
-        ++ [ ptyxis ]
         ++ [
           loupe
           papers
+          simple-scan
         ];
     };
 
diff --git a/modules/system/nixos/virtualisations/podman.nix b/modules/system/nixos/virtualisations/podman.nix
index a9684ca..d9041f8 100644
--- a/modules/system/nixos/virtualisations/podman.nix
+++ b/modules/system/nixos/virtualisations/podman.nix
@@ -7,6 +7,8 @@
 with lib;
 let
   cfg = config.os.virtualisation.podman;
+  all = builtins.attrNames config.users.users;
+  users = builtins.filter (user: config.users.users.${user}.isNormalUser == true) all;
 in
 {
   options.os.virtualisation.podman = {
@@ -30,5 +32,7 @@ in
       ];
     };
 
+    users.groups.podman.members = users;
+
   };
 }
diff --git a/overlays/nixos/overlays.nix b/overlays/nixos/overlays.nix
index 5a7c5a6..145e457 100644
--- a/overlays/nixos/overlays.nix
+++ b/overlays/nixos/overlays.nix
@@ -19,7 +19,6 @@
     ) (nixpkgs.lib.toList pkg.meta.license)
     || builtins.elem (nixpkgs.lib.getName pkg) [
       "nvidia-x11"
-      "obsidian"
     ];
 
   nixpkgs.overlays = [