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;
diff --git a/flake.lock b/flake.lock
index fa22456..79bd59c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -204,11 +204,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1686838567,
-        "narHash": "sha256-aqKCUD126dRlVSKV6vWuDCitfjFrZlkwNuvj5LtjRRU=",
+        "lastModified": 1721413321,
+        "narHash": "sha256-0GdiQScDceUrVGbxYpV819LHesK3szHOhJ09e6sgES4=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "429f232fe1dc398c5afea19a51aad6931ee0fb89",
+        "rev": "ab165a8a6cd12781d76fe9cbccb9e975d0fb634f",
         "type": "github"
       },
       "original": {
@@ -268,11 +268,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1721138476,
-        "narHash": "sha256-+W5eZOhhemLQxelojLxETfbFbc19NWawsXBlapYpqIA=",
+        "lastModified": 1721379653,
+        "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ad0b5eed1b6031efaed382844806550c3dcb4206",
+        "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
         "type": "github"
       },
       "original": {