diff --git a/flake.lock b/flake.lock index ee10bfe..d34d726 100644 --- a/flake.lock +++ b/flake.lock @@ -102,6 +102,27 @@ "type": "github" } }, + "emacs": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1742576675, + "narHash": "sha256-2JbkmTzqfb5c/zk2xM6JKHZzgN1YsxblgqucbI0P4bU=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "610d71db8074a369a0498572ff75b444d284409d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -201,11 +222,11 @@ ] }, "locked": { - "lastModified": 1742996658, - "narHash": "sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA=", + "lastModified": 1742569620, + "narHash": "sha256-igC2cu+cPRB3E4QwKR+vGagyAtoyB+DrmWwDKm8jkaw=", "owner": "nix-community", "repo": "home-manager", - "rev": "693840c01b9bef9e54100239cef937e53d4661bf", + "rev": "8a68f18e96bcab13e4f97bece61e6602298a3141", "type": "github" }, "original": { @@ -286,11 +307,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -363,6 +384,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1742512142, + "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1732014248, @@ -441,11 +478,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1742300892, + "narHash": "sha256-QmF0proyjXI9YyZO9GZmc7/uEu5KVwCtcdLsKSoxPAI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "ea26a82dda75bee6783baca6894040c8e6599728", "type": "github" }, "original": { @@ -459,6 +496,7 @@ "agenix": "agenix", "disko": "disko", "distro-grub-themes": "distro-grub-themes", + "emacs": "emacs", "home-manager": "home-manager_2", "nix-on-droid": "nix-on-droid", "nixpkgs": "nixpkgs", @@ -508,11 +546,11 @@ }, "stable": { "locked": { - "lastModified": 1742751704, - "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", + "lastModified": 1742512142, + "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", + "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1f9095c..e2ab79a 100644 --- a/flake.nix +++ b/flake.nix @@ -28,11 +28,11 @@ inputs.nixpkgs.follows = "nixpkgs-droid"; }; - # emacs = { - # url = "github:nix-community/emacs-overlay"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; - # + emacs = { + url = "github:nix-community/emacs-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # simplex-chat = { # url = "github:simplex-chat/simplex-chat"; # inputs.nixpkgs.follows = "nixpkgs"; @@ -92,9 +92,9 @@ { nixpkgs = { config.allowUnfree = true; - # overlays = with inputs; [ - # emacs.overlay - # ]; + overlays = with inputs; [ + emacs.overlay + ]; }; } ) diff --git a/home/alex/programs/emacs/doom/config.el b/home/alex/programs/emacs/doom/config.el index 46aed85..284c64f 100644 --- a/home/alex/programs/emacs/doom/config.el +++ b/home/alex/programs/emacs/doom/config.el @@ -295,9 +295,12 @@ :after org :config (setq! denote-directory (concat org-directory "/notes")) + (require 'denote-journal-extras) + (setq! denote-journal-extras-title-format 'day-date-month-year) (map! :leader (:prefix ("n" . "notes") :desc "Denote" "d" #'denote-open-or-create-with-command + :desc "New journal entry" "j" #'denote-journal-extras-new-or-existing-entry )) :bind (("C-c n d" . #'denote-open-or-create-with-command)) diff --git a/hosts/dregil/default.nix b/hosts/dregil/default.nix index ebcbc53..68331df 100644 --- a/hosts/dregil/default.nix +++ b/hosts/dregil/default.nix @@ -11,6 +11,9 @@ { nixpkgs = { config.allowUnfree = true; + overlays = with inputs; [ + emacs.overlay + ]; }; home-manager.extraSpecialArgs = { inherit stable; }; }