mirror of
https://github.com/ItsDrike/nixdots
synced 2025-06-30 02:10:43 +00:00
Run alejandra
This commit is contained in:
parent
286920def4
commit
c00134da1c
152 changed files with 827 additions and 721 deletions
|
@ -1,9 +1,5 @@
|
|||
{
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
|
||||
scriptPkgs = (import ./bin {inherit pkgs;});
|
||||
{pkgs, ...}: let
|
||||
scriptPkgs = import ./bin {inherit pkgs;};
|
||||
in {
|
||||
programs.git = {
|
||||
aliases = {
|
||||
|
@ -70,6 +66,8 @@ in {
|
|||
|
||||
set-upstream = "!git branch --set-upstream-to=origin/`git symbolic-ref --short HEAD`";
|
||||
|
||||
fixup-picker = "!git log -n 50 --pretty=format:'%h %s' --no-merges | fzf | cut -c -7 | xargs -o git commit --fixup";
|
||||
|
||||
staash = "stash --all";
|
||||
stash-staged = "!sh -c 'git stash --keep-index; git stash push -m \"staged\" --keep-index; git stash pop stash@{1}'";
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{pkgs, ...}:
|
||||
pkgs.writeShellScriptBin "better-git-branch" ''
|
||||
${builtins.readFile ./better-git-branch.sh}
|
||||
''
|
||||
pkgs.writeShellScriptBin "better-git-branch" ''
|
||||
${builtins.readFile ./better-git-branch.sh}
|
||||
''
|
||||
|
|
|
@ -1,7 +1,4 @@
|
|||
{
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
{pkgs, ...}: let
|
||||
packages = {
|
||||
better-git-branch = pkgs.callPackage ./better-git-branch {};
|
||||
};
|
||||
|
|
|
@ -1,8 +1,10 @@
|
|||
{ osConfig, pkgs, ... }:
|
||||
let
|
||||
myGitConf = osConfig.myOptions.home-manager.git;
|
||||
in
|
||||
{
|
||||
osConfig,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
myGitConf = osConfig.myOptions.home-manager.git;
|
||||
in {
|
||||
imports = [
|
||||
./gh.nix
|
||||
./ignores.nix
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, ... }: {
|
||||
{pkgs, ...}: {
|
||||
programs.gh = {
|
||||
enable = true;
|
||||
gitCredentialHelper.enable = false;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue