Skip to content

Commit

Permalink
Misc changes (#297)
Browse files Browse the repository at this point in the history
* nix run .#update

* Add new git alias for quick commit --amend

* Change yubikey software

* Random vscode settings changes

* Show pane frames in zellij
  • Loading branch information
francishamel authored Aug 29, 2024
1 parent 52f347d commit 6b91010
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 11 deletions.
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions home-manager/modules/git.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
userName = "Francis Hamel";
userEmail = "[email protected]";
aliases = {
ca = "commit --amend";
cf = "commit --fixup";
fp = "fetch --prune";
pfwl = "push --force-with-lease";
Expand Down
1 change: 0 additions & 1 deletion home-manager/modules/terminal.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
pkgs.d2
pkgs.devenv
pkgs.flyctl
pkgs.yubikey-manager
];
}
2 changes: 2 additions & 0 deletions home-manager/modules/vscode.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
mutableExtensionsDir = false;
userSettings = {
"diffEditor.ignoreTrimWhitespace" = false;
"editor.accessibilitySupport" = "off";
"editor.fontFamily" = "'FiraCode Nerd Font'";
"editor.fontLigatures" = true;
"editor.formatOnSave" = true;
Expand Down Expand Up @@ -56,6 +57,7 @@
};
};
};
"scm.showHistoryGraph" = false;
"tailwindCSS.includeLanguages" = {
"elixir" = "html";
"phoenix-heex" = "html";
Expand Down
1 change: 0 additions & 1 deletion home-manager/modules/zellij.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
enableZshIntegration = true;
settings = {
on_force_close = "quit";
pane_frames = false;
};
};
}
1 change: 1 addition & 0 deletions nixos/darwin/homebrew.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"slack"
"spotify"
"todoist"
"yubico-yubikey-manager"
];
};
}

0 comments on commit 6b91010

Please sign in to comment.