Skip to content

Commit 7f590dc

Browse files
committed
feat: nixfmt
1 parent 48817be commit 7f590dc

File tree

7 files changed

+34
-13
lines changed

7 files changed

+34
-13
lines changed

.github/workflows/gitguardian.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
fetch-depth: 0 # fetch all history so multiple commits can be scanned
1414

1515
- name: GitGuardian scan
16-
uses: GitGuardian/ggshield/actions/secret@main
16+
uses: GitGuardian/ggshield/actions/secret@cfb60b30abf1fd5f18a736220612c4b055a3932b
1717
env:
1818
GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }}
1919
GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}

nix/flake.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
nixpkgs-unstable.url = "github:nixoS/nixpkgs/nixpkgs-unstable";
1111
};
1212

13-
outputs = inputs:
13+
outputs =
14+
inputs:
1415
let
1516
dotfilesDir = "Developer/dotfiles";
1617
username = "tmm";

nix/modules/darwin.nix

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
{ pkgs, username, ... }: {
1+
{ pkgs, username, ... }:
2+
{
23
environment = {
34
systemPackages = with pkgs; [
45
fish
@@ -54,8 +55,14 @@
5455
settings = {
5556
substituters = [ "https://cache.nixos.org" ];
5657
trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
57-
trusted-users = [ "root" username ];
58-
experimental-features = [ "nix-command" "flakes" ];
58+
trusted-users = [
59+
"root"
60+
username
61+
];
62+
experimental-features = [
63+
"nix-command"
64+
"flakes"
65+
];
5966
};
6067
};
6168
programs.fish.enable = true;

nix/modules/git.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
{ ... }: {
1+
{ ... }:
2+
{
23
programs.git = {
34
enable = true;
45
aliases = {
@@ -36,6 +37,7 @@
3637
userName = "Tom Meagher";
3738
userEmail = "[email protected]";
3839
extraConfig = {
40+
branch.sort = "-committerdate";
3941
color.ui = "auto";
4042
commit.gpgsign = true;
4143
core = {
@@ -95,4 +97,3 @@
9597
};
9698
};
9799
}
98-

nix/modules/home-manager.nix

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
{ config, dotfilesDir, lib, pkgs, ... }: {
1+
{
2+
config,
3+
dotfilesDir,
4+
lib,
5+
pkgs,
6+
...
7+
}:
8+
{
29
home.packages = with pkgs; [
310
amber
411
asciinema
@@ -20,6 +27,7 @@
2027
httpie
2128
jq
2229
neovim
30+
nixfmt-rfc-style
2331
ripgrep
2432
rustup
2533
starship

nix/modules/opencode.nix

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@ let
33
colors = import ./colors.nix;
44
in
55
{
6-
xdg.configFile."AGENTS.md".source = config.lib.file.mkOutOfStoreSymlink "${config.home.sessionVariables.DOTFILES_HOME}/nix/files/AGENTS.md";
6+
xdg.configFile."AGENTS.md".source =
7+
config.lib.file.mkOutOfStoreSymlink "${config.home.sessionVariables.DOTFILES_HOME}/nix/files/AGENTS.md";
78

89
xdg.configFile."opencode/opencode.json".text = builtins.toJSON {
910
"$schema" = "https://opencode.ai/config.json";
10-
disabled_providers = [ "openai" "gemini" ];
11+
disabled_providers = [
12+
"openai"
13+
"gemini"
14+
];
1115
"keybinds" = {
1216
"messages_page_up" = "ctrl+u";
1317
"messages_page_down" = "ctrl+d";
@@ -256,4 +260,3 @@ in
256260
};
257261
};
258262
}
259-

nix/modules/shell.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
{ pkgs, ... }: {
1+
{ pkgs, ... }:
2+
{
23
programs.fish = {
34
enable = true;
45
interactiveShellInit = ''
@@ -20,6 +21,7 @@
2021
set -gx FOUNDRY_DIR "$HOME/.foundry"
2122
set -gx PATH "$FOUNDRY_DIR" $PATH
2223
set FOUNDRY_BIN $HOME/.foundry/bin
24+
set -gx FOUNDRY_DISABLE_NIGHTLY_WARNING true
2325
fish_add_path $FOUNDRY_BIN
2426
2527
# Add `pg_config` to path
@@ -75,4 +77,3 @@
7577
};
7678
};
7779
}
78-

0 commit comments

Comments
 (0)