From a55195325c7add1360ca97aa5139cdf1c2f18244 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Mon, 31 Mar 2025 22:24:27 +0200 Subject: [PATCH 1/4] chore: Update inputs --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index d34d726..bbbd33a 100644 --- a/flake.lock +++ b/flake.lock @@ -110,11 +110,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1742576675, - "narHash": "sha256-2JbkmTzqfb5c/zk2xM6JKHZzgN1YsxblgqucbI0P4bU=", + "lastModified": 1743006152, + "narHash": "sha256-1mkjVaVLaQVJSnW0/ziFpqevuU9p74niwF4tkS3wHMo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "610d71db8074a369a0498572ff75b444d284409d", + "rev": "8566c4f4dea1698078dc003a7c55ba7f59ac3b27", "type": "github" }, "original": { @@ -222,11 +222,11 @@ ] }, "locked": { - "lastModified": 1742569620, - "narHash": "sha256-igC2cu+cPRB3E4QwKR+vGagyAtoyB+DrmWwDKm8jkaw=", + "lastModified": 1742996658, + "narHash": "sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA=", "owner": "nix-community", "repo": "home-manager", - "rev": "8a68f18e96bcab13e4f97bece61e6602298a3141", + "rev": "693840c01b9bef9e54100239cef937e53d4661bf", "type": "github" }, "original": { @@ -307,11 +307,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1742889210, + "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "698214a32beb4f4c8e3942372c694f40848b360d", "type": "github" }, "original": { @@ -386,11 +386,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1742512142, - "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", + "lastModified": 1742751704, + "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", + "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", "type": "github" }, "original": { @@ -478,11 +478,11 @@ ] }, "locked": { - "lastModified": 1742300892, - "narHash": "sha256-QmF0proyjXI9YyZO9GZmc7/uEu5KVwCtcdLsKSoxPAI=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ea26a82dda75bee6783baca6894040c8e6599728", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -546,11 +546,11 @@ }, "stable": { "locked": { - "lastModified": 1742512142, - "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", + "lastModified": 1742751704, + "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", + "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", "type": "github" }, "original": { From 5aa09155edbb01e5209ab184ce6dd5a10fb09180 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Mon, 31 Mar 2025 22:24:58 +0200 Subject: [PATCH 2/4] fix(emacs): Denote does not provide journal module anymore --- home/alex/programs/emacs/doom/config.el | 3 --- 1 file changed, 3 deletions(-) diff --git a/home/alex/programs/emacs/doom/config.el b/home/alex/programs/emacs/doom/config.el index 284c64f..46aed85 100644 --- a/home/alex/programs/emacs/doom/config.el +++ b/home/alex/programs/emacs/doom/config.el @@ -295,12 +295,9 @@ :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)) From 08dc438dab2656a34c318268a8e9c65e021dd0d4 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Mon, 31 Mar 2025 22:26:40 +0200 Subject: [PATCH 3/4] fix(dregil): Do not use the emacs overlay --- hosts/dregil/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/hosts/dregil/default.nix b/hosts/dregil/default.nix index 68331df..ebcbc53 100644 --- a/hosts/dregil/default.nix +++ b/hosts/dregil/default.nix @@ -11,9 +11,6 @@ { nixpkgs = { config.allowUnfree = true; - overlays = with inputs; [ - emacs.overlay - ]; }; home-manager.extraSpecialArgs = { inherit stable; }; } From ce246b359c679ae9a0931bab0bc5ccac8af92d36 Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Mon, 31 Mar 2025 22:27:53 +0200 Subject: [PATCH 4/4] fix(thrall): Remove emacs overlay --- flake.lock | 38 -------------------------------------- flake.nix | 16 ++++++++-------- 2 files changed, 8 insertions(+), 46 deletions(-) diff --git a/flake.lock b/flake.lock index bbbd33a..ee10bfe 100644 --- a/flake.lock +++ b/flake.lock @@ -102,27 +102,6 @@ "type": "github" } }, - "emacs": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1743006152, - "narHash": "sha256-1mkjVaVLaQVJSnW0/ziFpqevuU9p74niwF4tkS3wHMo=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "8566c4f4dea1698078dc003a7c55ba7f59ac3b27", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -384,22 +363,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1742751704, - "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1732014248, @@ -496,7 +459,6 @@ "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", diff --git a/flake.nix b/flake.nix index e2ab79a..1f9095c 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 + # ]; }; } )