mirror of
https://github.com/ryanccn/flake.git
synced 2025-12-06 08:10:43 +01:00
chore: update configs
This commit is contained in:
parent
79bc61a28e
commit
2e1d4ef8f2
10 changed files with 63 additions and 82 deletions
|
|
@ -112,6 +112,7 @@ in
|
|||
"git.suggestSmartCommit" = false;
|
||||
"git.branchRandomName.enable" = true;
|
||||
"git.blame.editorDecoration.enabled" = true;
|
||||
"git.useIntegratedAskPass" = false;
|
||||
|
||||
"diffEditor.renderSideBySide" = false;
|
||||
"diffEditor.ignoreTrimWhitespace" = false;
|
||||
|
|
@ -122,6 +123,7 @@ in
|
|||
"editor.lineHeight" = 1.5;
|
||||
# "editor.cursorBlinking" = "phase";
|
||||
# "editor.cursorSmoothCaretAnimation" = "on";
|
||||
"editor.minimap.enabled" = false;
|
||||
# "editor.minimap.renderCharacters" = false;
|
||||
"workbench.editor.highlightModifiedTabs" = true;
|
||||
"workbench.editor.empty.hint" = "hidden";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
imports = [
|
||||
inputs.catppuccin.homeModules.catppuccin
|
||||
inputs.nix-index-database.hmModules.nix-index
|
||||
inputs.nix-index-database.homeModules.nix-index
|
||||
|
||||
./variables.nix
|
||||
./fonts.nix
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
# SPDX-FileCopyrightText: 2025 Ryan Cao <hello@ryanccn.dev>
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
{
|
||||
"g".command = "git";
|
||||
"j".command = "just";
|
||||
|
||||
"nb".command = "nix build";
|
||||
"nfu".command = "nix flake update";
|
||||
|
||||
"glol".command =
|
||||
"git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'";
|
||||
"glol".fishAlias = true;
|
||||
|
||||
"ghrvw".command = "gh repo view --web";
|
||||
|
||||
"opr".command = "op run --env-file=.env.1password --";
|
||||
"dr".command = "doppler run --";
|
||||
|
||||
"dequarantine".command = "xattr -d com.apple.quarantine";
|
||||
|
||||
"bcpa".command = "brew cleanup --prune=all";
|
||||
"puil".command = "pnpm update --interactive --latest";
|
||||
}
|
||||
|
|
@ -2,22 +2,30 @@
|
|||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
{ lib, ... }:
|
||||
let
|
||||
aliases = import ./aliases.nix;
|
||||
|
||||
shellAbbrs = builtins.mapAttrs (lib.const (builtins.getAttr "command")) (
|
||||
lib.filterAttrs (_: a: !(lib.maybeAttr "fishAlias" false a)) aliases
|
||||
);
|
||||
shellAliases = builtins.mapAttrs (lib.const (builtins.getAttr "command")) (
|
||||
lib.filterAttrs (_: a: lib.maybeAttr "fishAlias" false a) aliases
|
||||
);
|
||||
in
|
||||
{
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
|
||||
inherit shellAbbrs shellAliases;
|
||||
shellAbbrs = {
|
||||
g = "git";
|
||||
j = "just";
|
||||
|
||||
nb = "nix build";
|
||||
nfu = "nix flake update";
|
||||
|
||||
glol = "git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'";
|
||||
ghrvw = "gh repo view --web";
|
||||
|
||||
opr = "op run --env-file=.env.1password --";
|
||||
dr = "doppler run --";
|
||||
|
||||
dequarantine = "xattr -d com.apple.quarantine";
|
||||
|
||||
bcpa = "brew cleanup --prune=all";
|
||||
puil = "pnpm update --interactive --latest";
|
||||
};
|
||||
|
||||
shellAliases = { };
|
||||
|
||||
shellInit = ''
|
||||
for config in ${./fish/configs}/*.fish
|
||||
|
|
|
|||
|
|
@ -2,9 +2,10 @@
|
|||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
_: {
|
||||
{ config, ... }:
|
||||
{
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
dotDir = ".config/zsh";
|
||||
dotDir = "${config.xdg.configHome}/zsh";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue