aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--macos.local/.flake/flake.nix.org2
-rw-r--r--macos.local/.flake/home/programs/emacs/core.nix.org9
2 files changed, 5 insertions, 6 deletions
diff --git a/macos.local/.flake/flake.nix.org b/macos.local/.flake/flake.nix.org
index 0607fd8..df858fb 100644
--- a/macos.local/.flake/flake.nix.org
+++ b/macos.local/.flake/flake.nix.org
@@ -20,7 +20,7 @@
home-manager.darwinModules.home-manager
{
home-manager.backupFileExtension = "bak";
- home-manager.useGlobalPkgs = true;
+ home-manager.useGlobalPkgs = false;
home-manager.useUserPackages = true;
home-manager.users.jjanzen = import ./home/core.nix;
}
diff --git a/macos.local/.flake/home/programs/emacs/core.nix.org b/macos.local/.flake/home/programs/emacs/core.nix.org
index f833526..b993387 100644
--- a/macos.local/.flake/home/programs/emacs/core.nix.org
+++ b/macos.local/.flake/home/programs/emacs/core.nix.org
@@ -24,7 +24,6 @@
'';
};
};
-
nixpkgs.overlays = [
(final: prev:
{
@@ -35,17 +34,17 @@
# Fix OS window role (needed for window managers like yabai)
(prev.fetchpatch {
url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/fix-window-role.patch";
- sha256 = "0c41rgpi19vr9ai740g09lka3nkjk48ppqyqdnncjrkfgvm2710z";
+ sha256 = "sha256-+z/KfsBm1lvZTZNiMbxzXQGRTjkCFO4QPlEK35upjsE=";
})
# Enable rounded window with no decoration
(prev.fetchpatch {
url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-29/round-undecorated-frame.patch";
- sha256 = "111i0r3ahs0f52z15aaa3chlq7ardqnzpwp8r57kfsmnmg6c2nhf";
+ sha256 = "sha256-uYIxNTyfbprx5mCqMNFVrBcLeo+8e21qmBE3lpcnd+4=";
})
# Make Emacs aware of OS-level light/dark mode
(prev.fetchpatch {
url = "https://raw.githubusercontent.com/d12frosted/homebrew-emacs-plus/master/patches/emacs-28/system-appearance.patch";
- sha256 = "14ndp2fqqc95s70fwhpxq58y8qqj4gzvvffp77snm2xk76c1bvnn";
+ sha256 = "sha256-oM6fXdXCWVcBnNrzXmF0ZMdp8j0pzkLE66WteeCutv8=";
})
];
});
@@ -53,7 +52,7 @@
)
];
programs.emacs = {
- enable = false;
+ enable = true;
package = pkgs.emacs29-pgtk;
};
}