diff --git a/.gitmodules b/.gitmodules index ce31d24..1466865 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "submodules/beets-config"] path = submodules/beets-config url = ssh://git@gitea.pestctrl.io:2223/pestctrl/beets-config.git +[submodule "submodules/tmux-config"] + path = submodules/tmux-config + url = git@github.com:pestctrl/tmux-config diff --git a/home/users/benson.nix b/home/users/benson.nix index 789b91e..effc78a 100644 --- a/home/users/benson.nix +++ b/home/users/benson.nix @@ -16,6 +16,7 @@ in { ]; my.beets-config.enable = true; + my.tmux-config.enable = true; my.flakeLocation = lib.mkIf (builtins.hasAttr "osConfig" args) args.osConfig.my.flakeLocation; diff --git a/submodules/default.nix b/submodules/default.nix index 906a126..b7c62fb 100644 --- a/submodules/default.nix +++ b/submodules/default.nix @@ -1,6 +1,7 @@ { inputs, config, pkgs, lib, ... }@args: let beets-cfg = config.my.beets-config; + tmux-cfg = config.my.tmux-config; in { options = { @@ -10,14 +11,15 @@ in type = lib.types.nullOr lib.types.path; }; my.beets-config.enable = lib.mkEnableOption "Enable beets configuration file"; + my.tmux-config.enable = lib.mkEnableOption "Enable tmux configuration file"; }; - config = lib.mkIf beets-cfg.enable { + config = { # xdg.configFile."beets/config.yaml".source = ./beets-config/config.yaml; home = { file = { - ".config/beets/config.yaml" = lib.mkIf (!( + ".config/beets/config.yaml" = lib.mkIf (beets-cfg.enable && !( config.my.flakeLocation == null && (lib.warn "Didn't set 'my.flakeLocation', I won't symlink beets' config.yaml into place" @@ -31,6 +33,16 @@ in # # recursive = true; }; + + ".config/tmux/tmux.conf" = lib.mkIf (tmux-cfg.enable && !( + config.my.flakeLocation == null && + (lib.warn + "Didn't set 'my.flakeLocation', I won't symlink tmux's tmux.conf into place" + true) + )) { + source = config.lib.file.mkOutOfStoreSymlink + "${config.my.flakeLocation}/submodules/tmux-config/tmux.conf"; + }; }; }; }; diff --git a/submodules/tmux-config b/submodules/tmux-config new file mode 160000 index 0000000..e5aa35f --- /dev/null +++ b/submodules/tmux-config @@ -0,0 +1 @@ +Subproject commit e5aa35f4f8ed5aad24844d56d2782ba924a38c8a