Fix shell assignment in global config and update package inheritance in rune host config
This commit is contained in:
parent
061611a63f
commit
09e96e329f
2 changed files with 4 additions and 2 deletions
|
@ -8,7 +8,7 @@
|
|||
let
|
||||
username = hostSpec.username;
|
||||
homeDir = hostSpec.home;
|
||||
shell = hostSpec.shell;
|
||||
shell = hostSpec.shell or pkgs.fish;
|
||||
in
|
||||
{
|
||||
imports = lib.flatten [
|
||||
|
@ -32,7 +32,7 @@ in
|
|||
EDITOR = "micro";
|
||||
FLAKE = "${homeDir}/git/Nix/dot.nix";
|
||||
MANPAGER = "batman";
|
||||
SHELL = shell;
|
||||
SHELL = lib.getExe shell;
|
||||
VISUAL = "micro";
|
||||
};
|
||||
preferXdgDirectories = true; # whether to make programs use XDG directories whenever supported
|
||||
|
|
|
@ -42,7 +42,9 @@
|
|||
## Productivity ##
|
||||
gimp
|
||||
inkscape
|
||||
;
|
||||
|
||||
inherit (pkgs.jetbrains)
|
||||
## Development ##
|
||||
idea-ultimate
|
||||
;
|
||||
|
|
Loading…
Add table
Reference in a new issue