Set emacs shell based on nix user config
Remove calling org-babel-load-file in extraConfig since I'm moving the emacs config directly into .emacs.d
This commit is contained in:
parent
e491e06927
commit
66238861b6
|
@ -41,7 +41,7 @@
|
|||
homeModules ? default.homeModules,
|
||||
stateVersion ? default.stateVersion,
|
||||
}: let
|
||||
specialArgs = {inherit hostName user;};
|
||||
specialArgs = {inherit hostName user group shell;};
|
||||
in
|
||||
nixpkgs.lib.nixosSystem {
|
||||
inherit system specialArgs;
|
||||
|
@ -212,7 +212,7 @@
|
|||
};
|
||||
};
|
||||
home-manager = {
|
||||
extraSpecialArgs = {inherit hostName;};
|
||||
extraSpecialArgs = specialArgs;
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
users = {
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
shell,
|
||||
...
|
||||
}: {
|
||||
imports = [../git/default.nix ../prog/default.nix];
|
||||
|
@ -14,8 +15,7 @@
|
|||
font = "${stylix.fonts.monospace.name}-${toString stylix.fonts.sizes.applications}";
|
||||
alpha = "${toString (floor (mul stylix.opacity.applications 100))}";
|
||||
in ''
|
||||
(org-babel-load-file "~/.emacs/README.org")
|
||||
(customize-set-variable 'shell-file-name "/bin/sh")
|
||||
(customize-set-variable 'shell-file-name "${pkgs.${shell}}/bin/${shell}")
|
||||
(add-to-list 'initial-frame-alist '(font . "${font}"))
|
||||
(add-to-list 'default-frame-alist '(font . "${font}"))
|
||||
(add-to-list 'initial-frame-alist '(alpha-background . ${alpha}))
|
||||
|
|
Loading…
Reference in a new issue