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

nixos
Moritz Böhme 2024-08-12 11:07:39 +02:00
commit cb8597a97a
Signed by: moritz
GPG Key ID: 970C6E89EB0547A9
2 changed files with 4 additions and 3 deletions

View File

@ -31,7 +31,7 @@ in
enable = true; enable = true;
shellAbbrs = shellConfig.abbreviations; shellAbbrs = shellConfig.abbreviations;
shellAliases = shellConfig.aliases; shellAliases = shellConfig.aliases;
shellInit = '' shellInit = /* fish */ ''
# Vi Mode # Vi Mode
fish_vi_key_bindings fish_vi_key_bindings
@ -62,7 +62,7 @@ in
end end
abbr --add dotdot --regex '^\.\.+$' --function multicd abbr --add dotdot --regex '^\.\.+$' --function multicd
abbr -a P --position anywhere --set-cursor "% | $PAGER" abbr -a .P --position anywhere --set-cursor "% | $PAGER"
function editor_edit function editor_edit
echo $EDITOR $argv echo $EDITOR $argv

View File

@ -39,7 +39,7 @@ in
}; };
optimise.enable = mkEnableOption "nix-optimise"; optimise.enable = mkEnableOption "nix-optimise";
useSuper = mkEnableOption "use nix super"; useSuper = mkEnableOption "use nix super";
useNom = mkEnableOption "use nix output monitor" // { default = true; }; useNom = mkEnableOption "use nix output monitor";
}; };
config = { config = {
@ -85,6 +85,7 @@ in
stable.flake = inputs.stable; stable.flake = inputs.stable;
dotfiles.flake = self; dotfiles.flake = self;
default.flake = self; default.flake = self;
d.flake = self;
}; };
settings = { settings = {