diff --git a/configuration/common/programs.nix b/configuration/common/programs.nix
index a970166..f9c9d82 100644
--- a/configuration/common/programs.nix
+++ b/configuration/common/programs.nix
@@ -22,7 +22,10 @@
     curl
   ];
 
-  programs.vim.defaultEditor = true;
+  programs.vim = {
+    enable = true;
+    defaultEditor = true;
+  };
 
   programs.mtr.enable = true;
 
diff --git a/configuration/desktop/gnome.nix b/configuration/desktop/gnome.nix
index 7136a3f..ee4fdac 100644
--- a/configuration/desktop/gnome.nix
+++ b/configuration/desktop/gnome.nix
@@ -7,9 +7,9 @@
   };
 
   environment.gnome.excludePackages = with pkgs.gnome; [
-    baobab
-    epiphany
-    gnome-calendar
+    pkgs.baobab
+    pkgs.epiphany
+    pkgs.gnome-calendar
     gnome-clocks
     pkgs.gnome-console
     gnome-contacts
@@ -20,15 +20,15 @@
     pkgs.gnome-photos
     gnome-weather
     pkgs.gnome-connections
-    simple-scan
-    yelp
-    geary
+    pkgs.simple-scan
+    pkgs.yelp
+    pkgs.geary
   ];
 
   environment.systemPackages = with pkgs; [
     evolution
-    gnome.gnome-terminal
-    gnome.gnome-tweaks
+    gnome-terminal
+    gnome-tweaks
   ];
 
   services.gnome.evolution-data-server.enable = true;