3 files changed, 25 insertions, 41 deletions
diff --git a/home/default.nix b/home/default.nix
index c8c8d52..1509591 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,13 +1,16 @@
 {
   inputs,
-  lib,
   config,
   vars,
   pkgs,
-  pkgs-unstable,
   ...
 }:
-
+let
+  unstable = import inputs.nixpkgs-unstable {
+    system = pkgs.stdenv.hostPlatform.system;
+    config.allowUnfree = true;
+  };
+in
 {
   imports = [
     # ./alacritty
@@ -26,7 +29,7 @@
     ./mail
     ./mpv
     ./newsboat
-    ./nvim
+    (import ./nvim { inherit unstable; })
     ./tenere
     ./ticker
     ./vale
@@ -377,7 +380,7 @@
       clipse # clipboard management
       impala # iwd terminal ui
       lux # youtube-downloader
-      pkgs-unstable.nom # rss reader
+      unstable.nom # rss reader
       rmpc # tui for mpd
       rtorrent # torrent
       starship # shell aid
@@ -450,10 +453,10 @@
       nvimpager # use neovim as pager
       pistol # file preview
       pkg-config # needed for compilation
-      pkgs-unstable.goose-cli # llm cli
-      pkgs-unstable.vale # spellcheck
-      pkgs-unstable.valeStyles.microsoft # spellcheck linters
-      pkgs-unstable.valeStyles.write-good # spellcheck linters
+      unstable.goose-cli # llm cli
+      unstable.vale # spellcheck
+      unstable.valeStyles.microsoft # spellcheck linters
+      unstable.valeStyles.write-good # spellcheck linters
       playerctl
       poppler-utils # pdf utilities
       rdrview # extract content from web page
@@ -480,8 +483,8 @@
       lean4 # theorem prover - broken
       lld # c and rust linker
       nodePackages.jsdoc # javascript documentation
-      pkgs-unstable.go
-      pkgs-unstable.golint # linter for go
+      unstable.go
+      unstable.golint # linter for go
       uv # python package installer
     ];
   };
diff --git a/home/mail/default.nix b/home/mail/default.nix
index 2b2b031..775f0b0 100644
--- a/home/mail/default.nix
+++ b/home/mail/default.nix
@@ -167,7 +167,14 @@ in
   };
 
   # Global settings for programs (not account-specific)
-  programs.mbsync.enable = true;
+  programs.mbsync = {
+    enable = true;
+  };
+
+  services.mbsync = {
+    enable = true;
+    frequency = "*:0/5";
+  };
 
   programs.notmuch = {
     enable = true;
@@ -215,30 +222,4 @@ in
       };
     };
   };
-
-  systemd.user.services.mbsync = {
-    Unit = {
-      Description = "Sync mail with mbsync";
-      After = [ "network-online.target" ];
-      Wants = [ "network-online.target" ];
-    };
-    Service = {
-      Type = "oneshot";
-      ExecStart = "${pkgs.isync}/bin/mbsync -a";
-    };
-    Install.WantedBy = [ "default.target" ];
-  };
-
-  systemd.user.timers.mbsync = {
-    Unit = {
-      Description = "Timer for mbsync mail synchronization";
-      Requires = "mbsync.service";
-    };
-    Timer = {
-      OnBootSec = "5m";
-      OnUnitInactiveSec = "5m";
-      Unit = "mbsync.service";
-    };
-    Install.WantedBy = [ "timers.target" ];
-  };
 }
diff --git a/home/nvim/default.nix b/home/nvim/default.nix
index 038d8d6..5f90be4 100644
--- a/home/nvim/default.nix
+++ b/home/nvim/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, pkgs-unstable, ... }:
+{ unstable, ... }:
 
 {
   programs.neovim =
@@ -12,7 +12,7 @@
       viAlias = true;
       vimAlias = true;
       vimdiffAlias = true;
-      extraPackages = with pkgs-unstable; [
+      extraPackages = with unstable; [
         inotify-tools
 
         # debuggers
@@ -54,7 +54,7 @@
         ps.debugpy
         ps.pynvim
       ];
-      plugins = with pkgs-unstable.vimPlugins; [
+      plugins = with unstable.vimPlugins; [
         {
           plugin = nvim-dap;
           config = toLuaFile ./plugins/dap.lua;