primrose/.files
1
0
Fork 0
mirror of https://codeberg.org/leana8959/.files.git synced 2025-12-06 06:39:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tree-wide: init fish completion module

Browse source
This commit is contained in:
Primrose 2025-11-02 12:25:01 +08:00
parent 006798d917
commit 82baec0470
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
4 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nix/configurations/hydrogen.nix
View file

@ -58,15 +58,16 @@ in
./hydrogen/nixos/programs.nix ./hydrogen/nixos/programs.nix
./hydrogen/nixos/connectivity.nix ./hydrogen/nixos/connectivity.nix
# QUIRK: ../nixosModules/common/fish.nix
# Had issue when building the installer as it fails to bootstrap itself
# Might be useful to disable for the first build.
../nixosModules/extra/secure_dns.nix
../nixosModules/common/disable-command-not-found.nix ../nixosModules/common/disable-command-not-found.nix
../nixosModules/common/network.nix ../nixosModules/common/network.nix
../nixosModules/common/sudo-conf.nix ../nixosModules/common/sudo-conf.nix
../nixosModules/common/system-nixconf.nix ../nixosModules/common/system-nixconf.nix
# QUIRK:
# Had issue when building the installer as it fails to bootstrap itself
# Might be useful to disable for the first build.
../nixosModules/extra/secure_dns.nix
../nixosModules/extra/leana.nix ../nixosModules/extra/leana.nix
# #

1
nix/configurations/vanadium.nix
View file

@ -101,6 +101,7 @@ in
./vanadium/nixos/unfree-predicate.nix ./vanadium/nixos/unfree-predicate.nix
./vanadium/nixos/programs.nix ./vanadium/nixos/programs.nix
../nixosModules/common/fish.nix
../nixosModules/common/disable-command-not-found.nix ../nixosModules/common/disable-command-not-found.nix
../nixosModules/common/network.nix ../nixosModules/common/network.nix
../nixosModules/common/sudo-conf.nix ../nixosModules/common/sudo-conf.nix

22
nix/nixosModules/common/fish.nix Normal file
View file

@ -0,0 +1,22 @@
#
# This module links fish vendor completions, otherwise tab completion would be broken.
#
{
config,
lib,
...
}: let
fishNixOSEnabled = config.programs.fish.enable;
fishHMEnabled =
if config ? home-manager
then lib.any (userConfig: userConfig.programs.fish.enable) (lib.attrValues config.home-manager.users)
else false;
fishEnabled = fishNixOSEnabled || fishHMEnabled;
in {
environment.pathsToLink = lib.mkIf fishEnabled [
"/share/fish/vendor_conf.d"
"/share/fish/vendor_completions.d"
"/share/fish/vendor_functions.d"
];
}

6
nix/nixosModules/extra/leana.nix
View file

@ -18,12 +18,6 @@
}; };
users.groups.leana = {}; users.groups.leana = {};
environment.pathsToLink = [
"/share/fish/vendor_conf.d"
"/share/fish/vendor_completions.d"
"/share/fish/vendor_functions.d"
];
# #
# My nix binary cache # My nix binary cache
# #