diff --git a/.gitignore b/.gitignore
index 1797b10..c056c8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 **/*.bak
+*.swp
diff --git a/flake.lock b/flake.lock
index 2f67277..b26a310 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,6 +20,23 @@
         "type": "github"
       }
     },
+    "emacs-config": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1708892603,
+        "narHash": "sha256-cHFK+z3RLeqRwdRtY9c8fE+djt93FiHY19uOJitKZWY=",
+        "ref": "main",
+        "rev": "315694498a6400a3bee71d660d65f62e27e65dcf",
+        "revCount": 519,
+        "type": "git",
+        "url": "https://git.marq42.xyz/mir/emacs"
+      },
+      "original": {
+        "ref": "main",
+        "type": "git",
+        "url": "https://git.marq42.xyz/mir/emacs"
+      }
+    },
     "flake-compat": {
       "locked": {
         "lastModified": 1688025799,
@@ -69,6 +86,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1709237383,
+        "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1708118438,
@@ -87,16 +120,16 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1709237383,
-        "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
+        "lastModified": 1701282334,
+        "narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
+        "rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -104,8 +137,10 @@
     "root": {
       "inputs": {
         "apple-silicon": "apple-silicon",
+        "emacs-config": "emacs-config",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_3",
+        "nixpkgs-unstable": "nixpkgs-unstable"
       }
     },
     "rust-overlay": {
diff --git a/flake.nix b/flake.nix
index 97ef4b8..2ed9c64 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,8 +1,8 @@
 {
   description = "NixOS configuration with Home Manager";
   inputs = {
-    # nixpkgs.url = "github:nixos/nixpkgs/23.11";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/23.11";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     apple-silicon = {
       url = "github:tpwrules/nixos-apple-silicon";
     };
@@ -12,9 +12,14 @@
     };
     emacs-config = {
       url = "git+https://git.marq42.xyz/mir/emacs?ref=main";
+      flake = false;
     };
   };
-  outputs = inputs@{ nixpkgs, home-manager, ... }: {
+  outputs = inputs@{ 
+	      self, 
+	      nixpkgs,
+	      nixpkgs-unstable,
+	      home-manager, ... }: {
     nixosConfigurations = {
       galvatron = nixpkgs.lib.nixosSystem {
 	system = "aarch64-linux";
diff --git a/home.nix b/home.nix
index d37cd94..868b150 100644
--- a/home.nix
+++ b/home.nix
@@ -1,5 +1,6 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:
 
+with lib.hm.gvariant;
 {
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
@@ -81,9 +82,7 @@
   # programs.gdb = {
   #   enable = true;
   # };
-  # home.file.".local/src/emacs".source = builtins.fetchGit {
-  #  url = "git:git.marq42.xyz/mir/emacs";
-  # };
+  # home.file.".local/src/emacs".source = inputs.emacs-config;
   # programs.dconf.enable = true;
   home.file.".local/share/backgrounds/mojave.jpg".source = builtins.fetchurl {
     url = "https://www.teahub.io/photos/full/154-1542362_mac-os-mojave-screenshot.jpg";
@@ -115,7 +114,7 @@
       "show-battery-percentage" = true;
     };
     "org/gnome/desktop/session" = {
-      "idle-delay" = 0;
+      "idle-delay" = mkUint32 0;
     };
   };