Skip to content

Commit

Permalink
format: apply nix fmt to project
Browse files Browse the repository at this point in the history
  • Loading branch information
@tcarrio
tcarrio committed Jul 16, 2024
1 parent a18b009 commit ad43d16
Show file tree
Hide file tree
Showing 39 changed files with 340 additions and 326 deletions.
4 changes: 2 additions & 2 deletions darwin/_mixins/console/homebrew.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ lib, platform, ... }: {
_: {
homebrew = {
enable = true;

taps = [];
taps = [ ];

# the following sets up Homebrew to NEVER update implicitly
# to update brew itself, use `brew upgrade`
Expand Down
260 changes: 130 additions & 130 deletions darwin/sktc0/brews.nix
View file
Original file line number Diff line number Diff line change
@@ -1,134 +1,134 @@
_: {
homebrew = {
taps = [
"auth0/auth0-cli"
"ankitpokhrel/jira-cli"
"codefresh-io/cli"
"oven-sh/bun"
];
homebrew = {
taps = [
"auth0/auth0-cli"
"ankitpokhrel/jira-cli"
"codefresh-io/cli"
"oven-sh/bun"
];

brews = [
"ansible"
"asdf"
"auth0"
"autoconf"
"automake"
"bash"
"bats-core"
"bison"
"bpython"
"brotli"
"bun"
"c-ares"
"ca-certificates"
"circleci"
"cloudflared"
"cmake"
"codefresh"
"conftest"
"coreutils"
"curl"
"dbus"
"deno"
"dive"
"docker-compose"
"editorconfig"
"flarectl"
"freetype"
"fswatch"
"gd"
"gettext"
"ghostscript"
"git-crypt"
"git"
"glib"
"gnu-getopt"
"gnupg"
"gnutls"
"go-task"
"go"
"gotop"
"gpatch"
"graphite2"
"graphviz"
"hadolint"
"htop"
"icu4c"
"imagemagick"
"jira-cli"
"jq"
"k6"
"k9s"
"krb5"
"kubernetes-cli"
"libedit"
"libiconv"
"libjpeg"
"libpng"
"libsodium"
"libtool"
"libxml2"
"libxslt"
"libyaml"
"libzip"
"m4"
"mkcert"
"mysql-client"
"mysql"
"ncdu"
"ninja"
"node"
"[email protected]"
"openssl"
"pandoc"
"pango"
"pcre"
"percona-toolkit"
"pkg-config"
"podman"
"portaudio"
"postgresql"
"postgresql@14"
"protobuf"
"protobuf@21"
"pyenv"
"[email protected]"
"[email protected]"
"[email protected]"
"[email protected]"
"pyyaml"
"qemu"
"r"
"re2c"
"readline"
"redis"
"ripgrep"
"rustup-init"
"shellcheck"
"shfmt"
"six"
"sops"
"spotifyd"
"sqlite"
"stern"
"telnet"
"terraform"
"terragrunt"
"unixodbc"
"unzip"
"wget"
"xz"
"yarn"
"zlib"
];
brews = [
"ansible"
"asdf"
"auth0"
"autoconf"
"automake"
"bash"
"bats-core"
"bison"
"bpython"
"brotli"
"bun"
"c-ares"
"ca-certificates"
"circleci"
"cloudflared"
"cmake"
"codefresh"
"conftest"
"coreutils"
"curl"
"dbus"
"deno"
"dive"
"docker-compose"
"editorconfig"
"flarectl"
"freetype"
"fswatch"
"gd"
"gettext"
"ghostscript"
"git-crypt"
"git"
"glib"
"gnu-getopt"
"gnupg"
"gnutls"
"go-task"
"go"
"gotop"
"gpatch"
"graphite2"
"graphviz"
"hadolint"
"htop"
"icu4c"
"imagemagick"
"jira-cli"
"jq"
"k6"
"k9s"
"krb5"
"kubernetes-cli"
"libedit"
"libiconv"
"libjpeg"
"libpng"
"libsodium"
"libtool"
"libxml2"
"libxslt"
"libyaml"
"libzip"
"m4"
"mkcert"
"mysql-client"
"mysql"
"ncdu"
"ninja"
"node"
"[email protected]"
"openssl"
"pandoc"
"pango"
"pcre"
"percona-toolkit"
"pkg-config"
"podman"
"portaudio"
"postgresql"
"postgresql@14"
"protobuf"
"protobuf@21"
"pyenv"
"[email protected]"
"[email protected]"
"[email protected]"
"[email protected]"
"pyyaml"
"qemu"
"r"
"re2c"
"readline"
"redis"
"ripgrep"
"rustup-init"
"shellcheck"
"shfmt"
"six"
"sops"
"spotifyd"
"sqlite"
"stern"
"telnet"
"terraform"
"terragrunt"
"unixodbc"
"unzip"
"wget"
"xz"
"yarn"
"zlib"
];

casks = [
"amethyst"
"docker"
"rstudio"
"secretive"
"sequel-ace"
"talon"
];
};
casks = [
"amethyst"
"docker"
"rstudio"
"secretive"
"sequel-ace"
"talon"
];
};
}
4 changes: 2 additions & 2 deletions examples/nextcloud.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Reference: https://carjorvaz.com/posts/the-holy-grail-nextcloud-setup-made-easy-by-nixos/

{ self, config, lib, pkgs, ... }:
{ config, pkgs, ... }:

{
services = {
Expand All @@ -20,7 +20,7 @@
enable = true;
hostName = "cloud.example.com";

# Need to manually increment with every major upgrade.
# Need to manually increment with every major upgrade.
package = pkgs.nextcloud27;

# Let NixOS install and configure the database automatically.
Expand Down
40 changes: 21 additions & 19 deletions flake.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,17 +102,17 @@
# - nixos-rebuild switch --fast --flake .#${HOST} \
# --target-host ${USERNAME}@${HOST}.${TAILNET} \
# --build-host ${USERNAME}@${HOST}.${TAILNET}
nuc-init = libx.mkHost { systemType = "server"; hostname = "nuc-init"; username = "nixos"; };
nuc0 = libx.mkHost { systemType = "server"; hostname = "nuc0"; username = "archon"; };
nuc1 = libx.mkHost { systemType = "server"; hostname = "nuc1"; username = "archon"; };
nuc2 = libx.mkHost { systemType = "server"; hostname = "nuc2"; username = "archon"; };
nuc3 = libx.mkHost { systemType = "server"; hostname = "nuc3"; username = "archon"; };
nuc4 = libx.mkHost { systemType = "server"; hostname = "nuc4"; username = "archon"; };
nuc5 = libx.mkHost { systemType = "server"; hostname = "nuc5"; username = "archon"; };
nuc6 = libx.mkHost { systemType = "server"; hostname = "nuc6"; username = "archon"; };
nuc7 = libx.mkHost { systemType = "server"; hostname = "nuc7"; username = "archon"; };
nuc8 = libx.mkHost { systemType = "server"; hostname = "nuc8"; username = "archon"; };
nuc9 = libx.mkHost { systemType = "server"; hostname = "nuc9"; username = "archon"; };
nuc-init = libx.mkHost { systemType = "server"; hostname = "nuc-init"; username = "nixos"; };
nuc0 = libx.mkHost { systemType = "server"; hostname = "nuc0"; username = "archon"; };
nuc1 = libx.mkHost { systemType = "server"; hostname = "nuc1"; username = "archon"; };
nuc2 = libx.mkHost { systemType = "server"; hostname = "nuc2"; username = "archon"; };
nuc3 = libx.mkHost { systemType = "server"; hostname = "nuc3"; username = "archon"; };
nuc4 = libx.mkHost { systemType = "server"; hostname = "nuc4"; username = "archon"; };
nuc5 = libx.mkHost { systemType = "server"; hostname = "nuc5"; username = "archon"; };
nuc6 = libx.mkHost { systemType = "server"; hostname = "nuc6"; username = "archon"; };
nuc7 = libx.mkHost { systemType = "server"; hostname = "nuc7"; username = "archon"; };
nuc8 = libx.mkHost { systemType = "server"; hostname = "nuc8"; username = "archon"; };
nuc9 = libx.mkHost { systemType = "server"; hostname = "nuc9"; username = "archon"; };
};

# Devshell for bootstrapping; acessible via 'nix develop' or 'nix-shell' (legacy)
Expand All @@ -138,13 +138,15 @@
overlays = import ./overlays { inherit inputs; };

# Custom packages; acessible via 'nix build', 'nix shell', etc
packages = let
mkNuc = user: name: libx.mkRawImage { systemType = "server"; hostname = name; username = user; };
in libx.forAllSystems
(system:
let
pkgs = nixpkgs.legacyPackages.${system};
in
packages =
let
mkNuc = user: name: libx.mkRawImage { systemType = "server"; hostname = name; username = user; };
in
libx.forAllSystems
(system:
let
pkgs = nixpkgs.legacyPackages.${system};
in
(import ./pkgs { inherit pkgs; })
//
{
Expand All @@ -160,7 +162,7 @@
system-image-nuc8 = mkNuc "archon" "nuc8";
system-image-nuc9 = mkNuc "archon" "nuc9";
}
);
);
# And custom nixos-generators definitions
# TODO: forAllSystems
# tk1 = libx.mkSdImage { hostname = "tk1"; username = "root"; systemType = "server"; };
Expand Down
10 changes: 5 additions & 5 deletions home-manager/_mixins/console/charm-freeze.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{ pkgs, ... }: {
home.packages = with pkgs; [ charm-freeze ];
home.packages = with pkgs; [ charm-freeze ];

home.file.".config/freeze/custom.json".text = builtins.readFile ./charm-freeze/config.json;
home.file.".config/freeze/custom.json".text = builtins.readFile ./charm-freeze/config.json;

programs.fish.shellAliases = {
frz = "freeze -c $HOME/.config/freeze/custom.json";
};
programs.fish.shellAliases = {
frz = "freeze -c $HOME/.config/freeze/custom.json";
};
}
Loading

0 comments on commit ad43d16

Please sign in to comment.