diff --git a/flake.lock b/flake.lock
index 0ba3c64..0f5bdec 100644
--- a/flake.lock
+++ b/flake.lock
@@ -90,24 +90,7 @@
         "disko": "disko",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_2",
-        "stable": "stable"
-      }
-    },
-    "stable": {
-      "locked": {
-        "lastModified": 1728740863,
-        "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
+        "nixpkgs": "nixpkgs_2"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 1acdd75..ae45725 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,6 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
 
-    stable.url = "github:NixOS/nixpkgs/nixos-24.05";
     nix-flatpak.url = "github:gmodena/nix-flatpak";
 
     home-manager = {
diff --git a/hosts/base/default.nix b/hosts/base/default.nix
index 9349ecf..2d610cf 100644
--- a/hosts/base/default.nix
+++ b/hosts/base/default.nix
@@ -22,7 +22,6 @@
     systemd-boot.enable = true;
     efi.canTouchEfiVariables = true;
   };
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant. Not needed if using GNOME
 
   # Enable networking
   networking.networkmanager.enable = true;
@@ -54,13 +53,8 @@
   # Configure console keymap
   console.keyMap = "cz-lat2";
 
-  # Enable CUPS to print documents.
-  services.printing = {
-    enable = true;
-    drivers = [ pkgs.samsung-unified-linux-driver ];
-  };
-
   # Define a user account. Don't forget to set a password with ‘passwd’.
+  # Replace name <krop> with a variable
   users.users.krop = {
     isNormalUser = true;
     description = "Jakub Kropáček";
@@ -119,57 +113,47 @@
     };
   };
 
-  services.tailscale.enable = true;
-
-  services.flatpak = {
-    enable = true;
-    remotes = [
-      {
-        name = "flathub";
-        location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
-      }
-      {
-        name = "flathub-beta";
-        location = "https://flathub.org/beta-repo/flathub-beta.flatpakrepo";
-      }
-    ];
-    packages = [
-      "org.gnome.World.PikaBackup"
-      "ca.desrt.dconf-editor"
-      "org.onlyoffice.desktopeditors"
-      "tv.kodi.Kodi"
-      "com.valvesoftware.Steam"
-      "com.github.tchx84.Flatseal"
-      "io.dbeaver.DBeaverCommunity"
-    ];
+  services = {
+    tailscale = {
+      enable = true;
+    };
+    flatpak = {
+      enable = true;
+      remotes = [
+        {
+          name = "flathub";
+          location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
+        }
+        {
+          name = "flathub-beta";
+          location = "https://flathub.org/beta-repo/flathub-beta.flatpakrepo";
+        }
+      ];
+      packages = [
+        "org.gnome.World.PikaBackup"
+        "ca.desrt.dconf-editor"
+        "org.onlyoffice.desktopeditors"
+        "tv.kodi.Kodi"
+        "com.valvesoftware.Steam"
+        "com.github.tchx84.Flatseal"
+        "io.dbeaver.DBeaverCommunity"
+      ];
+    };
+    avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
+    printing = {
+      enable = true;
+      drivers = [ pkgs.samsung-unified-linux-driver ];
+    };
   };
 
-  services.avahi = {
-    enable = true;
-    nssmdns4 = true;
-    openFirewall = true;
-  };
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
   networking = {
     nftables.enable = true;
     firewall.checkReversePath = "loose";
   };
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
diff --git a/hosts/lenar/default.nix b/hosts/lenar/default.nix
index cf01ff8..eb44ab1 100644
--- a/hosts/lenar/default.nix
+++ b/hosts/lenar/default.nix
@@ -59,6 +59,8 @@
   };
 
   home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
     extraSpecialArgs = {
       inherit inputs;
     };
diff --git a/users/krop/default.nix b/users/krop/default.nix
index 105df17..fc02bd0 100644
--- a/users/krop/default.nix
+++ b/users/krop/default.nix
@@ -51,28 +51,7 @@
     # '';
   };
 
-  # Home Manager can also manage your environment variables through
-  # 'home.sessionVariables'. These will be explicitly sourced when using a
-  # shell provided by Home Manager. If you don't want to manage your shell
-  # through Home Manager then you have to manually source 'hm-session-vars.sh'
-  # located at either
-  #
-  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  /etc/profiles/per-user/krop/etc/profile.d/hm-session-vars.sh
-  #
-  home.sessionVariables = {
-    # EDITOR = "emacs";
-  };
-
   dconf = {
-    enable = true;
     settings = {
       "org/gnome/shell" = {
         disable-user-extensions = false;