dala/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix fish bug 2

Browse source
This commit is contained in:
Victor Mignot 2024-08-02 21:05:28 +02:00
parent f7585b5bf4
commit 533f1494a5
Signed by: dala
GPG key ID: 5E7F2CE1BEAFED3D
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/workstation/default.nix
View file

@ -6,7 +6,6 @@
sopsHmModule, sopsHmModule,
... ...
}: }:
with lib;
{ {
imports = [ imports = [
@ -39,17 +38,15 @@ with lib;
keymap = config.console.keyMap; keymap = config.console.keyMap;
isNvidiaGpu = (config.my.hardware.gpu == "nvidia"); isNvidiaGpu = (config.my.hardware.gpu == "nvidia");
}; };
home-manager.users = builtins.mapAttrs ( home-manager.users = builtins.mapAttrs (name: value: {
name: value: imports = [ value.hmConfig ];
{
home.username = name; home.username = name;
home.homeDirectory = "/home/${name}"; home.homeDirectory = "/home/${name}";
home.stateVersion = machineProps.stateVersion; home.stateVersion = machineProps.stateVersion;
programs.home-manager.enable = true; programs.home-manager.enable = true;
programs.fish.enable = value.shell == pkgs.fish; programs.fish.enable = value.shell == pkgs.fish;
} }) config.my.users;
// value.hmConfig
) config.my.users;
} }
else else
{ } { }

5
modules/workstation/home-manager/fish.nix
View file

@ -1,10 +1,9 @@
{ {
lib,
pkgs, pkgs,
config, config,
lib,
... ...
}: }:
with lib;
let let
swayLaunchScript = swayLaunchScript =
if config.my.desktop.sway.enable then if config.my.desktop.sway.enable then
@ -17,7 +16,7 @@ let
""; "";
in in
{ {
config.programs.fish = mkIf config.programs.fish.enable { programs.fish = lib.mkIf config.programs.fish.enable {
plugins = [ plugins = [
{ {
name = "bobthefish"; name = "bobthefish";