diff --git a/nixos/boxes/foureighty.nix b/nixos/boxes/foureighty.nix
index 159622a7..f297c77b 100644
--- a/nixos/boxes/foureighty.nix
+++ b/nixos/boxes/foureighty.nix
@@ -38,7 +38,7 @@
     hardware.trackpoint.enable = true;
     services.fprintd = {
       enable = true;
-      package = pkgs.unstable.fprintd-thinkpad;
+      package = pkgs.fprintd-thinkpad;
     };
 
     hardware.nvidiaOptimus.disable = true;
diff --git a/nixos/common-services.nix b/nixos/common-services.nix
index 36f07e4e..59243699 100644
--- a/nixos/common-services.nix
+++ b/nixos/common-services.nix
@@ -3,7 +3,7 @@
   services = {
     fwupd = {
       enable = true;
-      package = pkgs.unstable.fwupd;
+      package = pkgs.fwupd;
     };
 
     tlp = {
diff --git a/nixos/common.nix b/nixos/common.nix
index a5e5843d..0cd7a1b5 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -2,7 +2,6 @@
 
 let
   unstableTarball = fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz;
-  etesync-dav = import ./packages/etesync-dav/default.nix;
 in
   {
     imports =
@@ -18,18 +17,10 @@ in
 
       nixpkgs.config = {
         allowUnfree = true;
-        packageOverrides = pkgs: {
-          unstable = import unstableTarball {
-            config = config.nixpkgs.config;
-          };
-          cyplo = import /home/cyryl/dev/nixpkgs {
-            config = config.nixpkgs.config;
-          };
-        };
       };
 
       environment.systemPackages = with pkgs; [
-        wget git gnupg curl tmux python36Packages.glances htop atop firefox home-manager alacritty pciutils powertop linuxPackages_hardened.bcc ripgrep-all fd dnsutils
+        wget git gnupg curl tmux python36Packages.glances htop atop firefox home-manager alacritty pciutils powertop ripgrep-all fd dnsutils
       ];
 
       i18n.defaultLocale = "en_GB.UTF-8";
diff --git a/nixos/gsconnect.nix b/nixos/gsconnect.nix
index 4672255c..8564a143 100644
--- a/nixos/gsconnect.nix
+++ b/nixos/gsconnect.nix
@@ -2,12 +2,4 @@
 {
   networking.firewall.allowedTCPPortRanges = [ { from = 1716; to = 1764; }  ];
   networking.firewall.allowedUDPPortRanges = [ { from = 1716; to = 1764; }  ];
-  environment.systemPackages = with pkgs; [
-    gnomeExtensions.gsconnect
-    (
-      vim_configurable.override {
-        python = python3;
-      }
-    )
-  ];
-}
\ No newline at end of file
+}
diff --git a/nixos/syncthing.nix b/nixos/syncthing.nix
index a22cbf23..0f3a60ce 100644
--- a/nixos/syncthing.nix
+++ b/nixos/syncthing.nix
@@ -5,6 +5,6 @@
     user = "cyryl";
     dataDir = "/home/cyryl/.syncthing";
     openDefaultPorts = true;
-    package = pkgs.unstable.syncthing;
+    package = pkgs.syncthing;
   };
 }
diff --git a/nixos/vim.nix b/nixos/vim.nix
index ebebce46..0317cd51 100644
--- a/nixos/vim.nix
+++ b/nixos/vim.nix
@@ -10,7 +10,7 @@
           endif
         '';
 
-        vam.knownPlugins = unstable.vimPlugins;
+        vam.knownPlugins = vimPlugins;
         vam.pluginDictionaries = [
           { names = [
             "ack-vim"
diff --git a/nixos/vscode.nix b/nixos/vscode.nix
index f8e8bd7e..c3011a35 100644
--- a/nixos/vscode.nix
+++ b/nixos/vscode.nix
@@ -2,7 +2,7 @@
 {
   users.users.cyryl = {
     packages = with pkgs; [
-      (unstable.vscode-with-extensions.override {
+      (vscode-with-extensions.override {
         vscodeExtensions = with vscode-extensions; [ bbenoist.Nix  ]
         ++ vscode-utils.extensionsFromVscodeMarketplace [
           {