Merge remote-tracking branch 'refs/remotes/origin/nixos' into nixos
This commit is contained in:
commit
cb8597a97a
2 changed files with 4 additions and 3 deletions
|
@ -31,7 +31,7 @@ in
|
|||
enable = true;
|
||||
shellAbbrs = shellConfig.abbreviations;
|
||||
shellAliases = shellConfig.aliases;
|
||||
shellInit = ''
|
||||
shellInit = /* fish */ ''
|
||||
# Vi Mode
|
||||
fish_vi_key_bindings
|
||||
|
||||
|
@ -62,7 +62,7 @@ in
|
|||
end
|
||||
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
|
||||
echo $EDITOR $argv
|
||||
|
|
|
@ -39,7 +39,7 @@ in
|
|||
};
|
||||
optimise.enable = mkEnableOption "nix-optimise";
|
||||
useSuper = mkEnableOption "use nix super";
|
||||
useNom = mkEnableOption "use nix output monitor" // { default = true; };
|
||||
useNom = mkEnableOption "use nix output monitor";
|
||||
};
|
||||
|
||||
config = {
|
||||
|
@ -85,6 +85,7 @@ in
|
|||
stable.flake = inputs.stable;
|
||||
dotfiles.flake = self;
|
||||
default.flake = self;
|
||||
d.flake = self;
|
||||
};
|
||||
|
||||
settings = {
|
||||
|
|
Loading…
Reference in a new issue