pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Set emacs shell based on nix user config

Browse source 
Remove calling org-babel-load-file in extraConfig since I'm moving the
emacs config directly into .emacs.d
This commit is contained in:
Evie Litherland-Smith 2024-02-15 07:15:19 +00:00
parent e491e06927
commit 66238861b6
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
flake.nix
View file

@ -41,7 +41,7 @@
homeModules ? default.homeModules, homeModules ? default.homeModules,
stateVersion ? default.stateVersion, stateVersion ? default.stateVersion,
}: let }: let
specialArgs = {inherit hostName user;}; specialArgs = {inherit hostName user group shell;};
in in
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system specialArgs;
@ -212,7 +212,7 @@
}; };
}; };
home-manager = { home-manager = {
extraSpecialArgs = {inherit hostName;}; extraSpecialArgs = specialArgs;
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users = { users = {

4
home/emacs/default.nix
View file

@ -1,6 +1,7 @@
{ {
config, config,
pkgs, pkgs,
shell,
... ...
}: { }: {
imports = [../git/default.nix ../prog/default.nix]; imports = [../git/default.nix ../prog/default.nix];
@ -14,8 +15,7 @@
font = "${stylix.fonts.monospace.name}-${toString stylix.fonts.sizes.applications}"; font = "${stylix.fonts.monospace.name}-${toString stylix.fonts.sizes.applications}";
alpha = "${toString (floor (mul stylix.opacity.applications 100))}"; alpha = "${toString (floor (mul stylix.opacity.applications 100))}";
in '' in ''
(org-babel-load-file "~/.emacs/README.org") (customize-set-variable 'shell-file-name "${pkgs.${shell}}/bin/${shell}")
(customize-set-variable 'shell-file-name "/bin/sh")
(add-to-list 'initial-frame-alist '(font . "${font}")) (add-to-list 'initial-frame-alist '(font . "${font}"))
(add-to-list 'default-frame-alist '(font . "${font}")) (add-to-list 'default-frame-alist '(font . "${font}"))
(add-to-list 'initial-frame-alist '(alpha-background . ${alpha})) (add-to-list 'initial-frame-alist '(alpha-background . ${alpha}))