Use alejandra for formatting Nix files
This commit is contained in:
parent
7db4788e49
commit
7302dae7ec
17 changed files with 273 additions and 244 deletions
system/shared
|
@ -1,4 +1,8 @@
|
|||
{ inputs, pkgs, ... }:
|
||||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with pkgs; [
|
||||
awscli2
|
||||
bottom
|
||||
|
|
|
@ -1,6 +1,9 @@
|
|||
{ inputs, pkgs, username, self }:
|
||||
|
||||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
username,
|
||||
self,
|
||||
}: {
|
||||
home.username = "${username}";
|
||||
home.homeDirectory = "/home/${username}";
|
||||
|
||||
|
@ -9,7 +12,7 @@
|
|||
programs.home-manager.enable = true;
|
||||
|
||||
imports = [
|
||||
(import ./modules/neovim.nix { inherit inputs; })
|
||||
(import ./modules/neovim.nix {inherit inputs;})
|
||||
./modules/git.nix
|
||||
./modules/starship.nix
|
||||
./modules/tmux.nix
|
||||
|
@ -38,7 +41,7 @@
|
|||
nix-direnv.enable = true;
|
||||
};
|
||||
|
||||
home.sessionPath = [ "$HOME/.config/bin" ];
|
||||
home.sessionPath = ["$HOME/.config/bin"];
|
||||
|
||||
xdg.configFile."ripgrep/config".text = ''
|
||||
--follow
|
||||
|
|
|
@ -48,12 +48,10 @@
|
|||
current-branch = "rev-parse --abbrev-ref HEAD";
|
||||
dc = "diff --color --word-diff --cached";
|
||||
df = "diff --color --word-diff";
|
||||
dup =
|
||||
"!git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -";
|
||||
dup = "!git checkout develop && git fetch origin && echo && git sl develop..origin/develop && echo && git pull --quiet && git checkout -";
|
||||
fixup = "commit --fixup";
|
||||
issues = "!gh issue list --web";
|
||||
mup =
|
||||
"!git master-to-main-wrapper checkout %BRANCH% && git fetch origin && echo && git sl %BRANCH%..origin/%BRANCH% && echo && git pull --quiet && git checkout -";
|
||||
mup = "!git master-to-main-wrapper checkout %BRANCH% && git fetch origin && echo && git sl %BRANCH%..origin/%BRANCH% && echo && git pull --quiet && git checkout -";
|
||||
no-ff = "merge --no-ff";
|
||||
pl = "pull";
|
||||
prune = "remote prune origin";
|
||||
|
@ -65,12 +63,10 @@
|
|||
repush = "!git pull --rebase && git push";
|
||||
ri = "rebase --interactive";
|
||||
rid = "!git rebase -i $(git merge-base develop HEAD)";
|
||||
rim =
|
||||
"!git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)";
|
||||
rim = "!git rebase -i $(git master-to-main-wrapper merge-base %BRANCH% HEAD)";
|
||||
rip = "!git rebase -i $(git merge-base production HEAD)";
|
||||
ris = "!git rebase -i $(git merge-base staging HEAD)";
|
||||
riu =
|
||||
"!git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})";
|
||||
riu = "!git rebase -i $(git rev-parse --abbrev-ref --symbolic-full-name @{u})";
|
||||
rmup = "!git mup && git master-to-main-wrapper rebase %BRANCH%";
|
||||
sl = "log --oneline --decorate -20";
|
||||
sla = "log --oneline --decorate --graph --all -20";
|
||||
|
@ -92,7 +88,7 @@
|
|||
};
|
||||
checkout.defaultRemote = "origin";
|
||||
color.ui = true;
|
||||
commit = { template = "~/.gitmessage"; };
|
||||
commit = {template = "~/.gitmessage";};
|
||||
core = {
|
||||
editor = "nvim";
|
||||
excludesFile = "~/.config/git/ignore";
|
||||
|
|
|
@ -1,10 +1,7 @@
|
|||
{ inputs }: { pkgs, ... }:
|
||||
|
||||
let
|
||||
{inputs}: {pkgs, ...}: let
|
||||
system = pkgs.system;
|
||||
in
|
||||
{
|
||||
programs.neovim = inputs.opdavies-nvim.lib.mkHomeManager { inherit system; };
|
||||
in {
|
||||
programs.neovim = inputs.opdavies-nvim.lib.mkHomeManager {inherit system;};
|
||||
|
||||
home.file.".markdownlint.yaml".text = ''
|
||||
default: true
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
terminal = "tmux-256color";
|
||||
|
|
|
@ -200,19 +200,19 @@
|
|||
plugins = [
|
||||
{
|
||||
name = "themes/robbyrussell";
|
||||
tags = [ "from:oh-my-zsh" "as:theme" ];
|
||||
tags = ["from:oh-my-zsh" "as:theme"];
|
||||
}
|
||||
{
|
||||
name = "plugin/git";
|
||||
tags = [ "from:oh-my-zsh" ];
|
||||
tags = ["from:oh-my-zsh"];
|
||||
}
|
||||
{
|
||||
name = "plugin/vi-mode";
|
||||
tags = [ "from:oh-my-zsh" ];
|
||||
tags = ["from:oh-my-zsh"];
|
||||
}
|
||||
{ name = "mollifier/cd-gitroot"; }
|
||||
{ name = "zsh-users/zsh-completions"; }
|
||||
{ name = "zsh-users/zsh-syntax-highlighting"; }
|
||||
{name = "mollifier/cd-gitroot";}
|
||||
{name = "zsh-users/zsh-completions";}
|
||||
{name = "zsh-users/zsh-syntax-highlighting";}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue