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
|
let
|
||||||
username = hostSpec.username;
|
username = hostSpec.username;
|
||||||
homeDir = hostSpec.home;
|
homeDir = hostSpec.home;
|
||||||
shell = hostSpec.shell;
|
shell = hostSpec.shell or pkgs.fish;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = lib.flatten [
|
imports = lib.flatten [
|
||||||
|
@ -32,7 +32,7 @@ in
|
||||||
EDITOR = "micro";
|
EDITOR = "micro";
|
||||||
FLAKE = "${homeDir}/git/Nix/dot.nix";
|
FLAKE = "${homeDir}/git/Nix/dot.nix";
|
||||||
MANPAGER = "batman";
|
MANPAGER = "batman";
|
||||||
SHELL = shell;
|
SHELL = lib.getExe shell;
|
||||||
VISUAL = "micro";
|
VISUAL = "micro";
|
||||||
};
|
};
|
||||||
preferXdgDirectories = true; # whether to make programs use XDG directories whenever supported
|
preferXdgDirectories = true; # whether to make programs use XDG directories whenever supported
|
||||||
|
|
|
@ -42,7 +42,9 @@
|
||||||
## Productivity ##
|
## Productivity ##
|
||||||
gimp
|
gimp
|
||||||
inkscape
|
inkscape
|
||||||
|
;
|
||||||
|
|
||||||
|
inherit (pkgs.jetbrains)
|
||||||
## Development ##
|
## Development ##
|
||||||
idea-ultimate
|
idea-ultimate
|
||||||
;
|
;
|
||||||
|
|
Loading…
Add table
Reference in a new issue