Format using nixfmt

This commit is contained in:
Oliver Davies 2024-03-18 20:33:28 +00:00
parent a33c74c580
commit b1421c97e1
30 changed files with 184 additions and 265 deletions

View file

@ -1,8 +1,4 @@
{
inputs,
pkgs,
...
}:
{ inputs, pkgs, ... }:
with pkgs; [
awscli2
bitwarden-cli

View file

@ -1,9 +1,4 @@
{
inputs,
pkgs,
username,
self,
}: {
{ inputs, pkgs, username, self, }: {
home.username = "${username}";
home.homeDirectory = "/home/${username}";
@ -12,7 +7,7 @@
programs.home-manager.enable = true;
imports = [
(import ./modules/neovim.nix {inherit inputs;})
(import ./modules/neovim.nix { inherit inputs; })
./modules/bat.nix
./modules/bin.nix
./modules/direnv.nix

View file

@ -1,3 +1 @@
{
programs.bat.enable = true;
}
{ programs.bat.enable = true; }

View file

@ -1,5 +1,5 @@
{self, ...}: {
home.sessionPath = ["$HOME/.config/bin"];
{ self, ... }: {
home.sessionPath = [ "$HOME/.config/bin" ];
xdg.configFile.bin = {
source = "${self}/bin";

View file

@ -54,10 +54,12 @@
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";
@ -69,10 +71,12 @@
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";
@ -97,7 +101,7 @@
checkout.defaultRemote = "origin";
color.ui = true;
column.ui = "auto";
commit = {template = "~/.gitmessage";};
commit = { template = "~/.gitmessage"; };
core = {
editor = "nvim";
excludesFile = "~/.config/git/ignore";

View file

@ -1,3 +1 @@
{
programs.lsd.enable = true;
}
{ programs.lsd.enable = true; }

View file

@ -1,7 +1,8 @@
{inputs}: {pkgs, ...}: let
system = pkgs.system;
{ inputs }:
{ pkgs, ... }:
let system = pkgs.system;
in {
programs.neovim = inputs.opdavies-nvim.lib.mkHomeManager {inherit system;};
programs.neovim = inputs.opdavies-nvim.lib.mkHomeManager { inherit system; };
home.file.".markdownlint.yaml".text = ''
default: true

View file

@ -1,3 +1 @@
{
programs.nnn.enable = true;
}
{ programs.nnn.enable = true; }

View file

@ -1,4 +1,4 @@
{self, ...}: {
{ self, ... }: {
xdg.configFile.phpactor = {
source = "${self}/config/phpactor";
recursive = true;

View file

@ -1,5 +1,5 @@
{pkgs, ...}: {
home.packages = with pkgs; [ripgrep];
{ pkgs, ... }: {
home.packages = with pkgs; [ ripgrep ];
xdg.configFile."ripgrep/config".text = ''
--follow

View file

@ -1,3 +1 @@
{
programs.starship.enable = true;
}
{ programs.starship.enable = true; }

View file

@ -1,5 +1,5 @@
{pkgs, ...}: let
inherit (pkgs) tmuxPlugins;
{ pkgs, ... }:
let inherit (pkgs) tmuxPlugins;
in {
programs.tmux = {
enable = true;
@ -102,10 +102,7 @@ in {
set -g @resurrect-strategy-nvim 'session'
'';
plugins = [
tmuxPlugins.resurrect
tmuxPlugins.vim-tmux-navigator
tmuxPlugins.yank
];
plugins =
[ tmuxPlugins.resurrect tmuxPlugins.vim-tmux-navigator tmuxPlugins.yank ];
};
}

View file

@ -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"; }
];
};
};