moritz/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/nixos' into nixos

Browse source
This commit is contained in:
Moritz Böhme 2023-09-17 09:41:02 +02:00
commit 070fc5fb81
No known key found for this signature in database
GPG key ID: 970C6E89EB0547A9
7 changed files with 89 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/programs/fish.nix
View file

@ -8,9 +8,12 @@ with lib;
let
cfg = config.my.programs.fish;
shellConfig = config.my.shell;
exportVariables =
lib.mapAttrsToList (n: v: ''set -x ${n} "${v}"'') shellConfig.variables;
exportedVariables = lib.concatStringsSep "\n" exportVariables;
exportedVariables =
let
exportVariables =
lib.mapAttrsToList (n: v: ''set -x ${n} "${v}"'') shellConfig.variables;
in
lib.concatStringsSep "\n" exportVariables;
in
{
options.my.programs.fish.enable = mkEnableOption "fish";

3
modules/programs/hyprland/default.nix
View file

@ -9,7 +9,8 @@ with lib;
let
cfg = config.my.programs.hyprland;
hyprland = pkgs.hyprland.override { enableNvidiaPatches = cfg.nvidiaSupport; };
hyprland-nvidia = pkgs.hyprland.override { enableNvidiaPatches = true; };
hyprland = if cfg.nvidiaSupport then hyprland-nvidia else pkgs.hyprland;
in
{
options.my.programs.hyprland = {