diff --git a/home-manager/common.nix b/home-manager/common.nix
index 49d6fd7..e374545 100644
--- a/home-manager/common.nix
+++ b/home-manager/common.nix
@@ -229,7 +229,7 @@ in
character = {
success_symbol = "[›](bold green)";
- error_symbol = "[›](bold red)";
+ error_symbol = "[!](bold red)";
};
};
};
diff --git a/home-manager/flake-templates/investbay-flake.nix b/home-manager/flake-templates/investbay-flake.nix
index b0ba0c7..0e3b1ed 100644
--- a/home-manager/flake-templates/investbay-flake.nix
+++ b/home-manager/flake-templates/investbay-flake.nix
@@ -3,19 +3,21 @@
nix.url = "git+ssh://git@git.investbay.dev/devops/nix?branch=main";
};
- outputs = { self, nix }: {
- formatter = nix.formatter;
+ outputs =
+ { self, nix }:
+ {
+ formatter = nix.formatter;
- devShells = nix.lib.forAllSystems (pkgs: {
- default = pkgs.devshell.mkShell {
- name = "investbay";
+ devShells = nix.lib.forAllSystems (pkgs: {
+ default = pkgs.devshell.mkShell {
+ name = "investbay";
- packages = with pkgs; [
+ packages = with pkgs; [
- ];
+ ];
- commands = [];
- };
- });
- };
+ commands = [ ];
+ };
+ });
+ };
}
diff --git a/home-manager/flake-templates/yp-flake.nix b/home-manager/flake-templates/yp-flake.nix
index 105b384..23a28bb 100644
--- a/home-manager/flake-templates/yp-flake.nix
+++ b/home-manager/flake-templates/yp-flake.nix
@@ -3,19 +3,21 @@
nix.url = "git+ssh://git@bitbucket.org/yourpass/nix";
};
- outputs = { self, nix }: {
- formatter = nix.formatter;
+ outputs =
+ { self, nix }:
+ {
+ formatter = nix.formatter;
- devShells = nix.lib.forAllSystems (pkgs: {
- default = pkgs.devshell.mkShell {
- name = "yp";
+ devShells = nix.lib.forAllSystems (pkgs: {
+ default = pkgs.devshell.mkShell {
+ name = "yp";
- packages = with pkgs; [
+ packages = with pkgs; [
- ];
+ ];
- commands = [];
- };
- });
- };
+ commands = [ ];
+ };
+ });
+ };
}
diff --git a/home-manager/nix-init-scripts.nix b/home-manager/nix-init-scripts.nix
index 11b1f63..0053835 100644
--- a/home-manager/nix-init-scripts.nix
+++ b/home-manager/nix-init-scripts.nix
@@ -1,68 +1,90 @@
{ lib, pkgs, ... }:
let
- flake-dir = {flake, impure ? false}: pkgs.writeShellScript "nix-prepare" ''
- run() {
- local dir="$1"
- echo "Preparing nix environment in $dir"
+ flake-dir =
+ {
+ flake,
+ impure ? false,
+ }:
+ pkgs.writeShellScript "nix-prepare" ''
+ run() {
+ local dir="$1"
+ echo "Preparing nix environment in $dir"
- if [ "$dir" = "" ]; then
- echo "Usage: nix-prepare
"
- exit 1
- fi
+ if [ "$dir" = "" ]; then
+ echo "Usage: nix-prepare "
+ exit 1
+ fi
- mkdir -p $dir
- cd $dir
+ mkdir -p $dir
+ cd $dir
- git init
+ git init
- # Insert the nix flake
- cp ${flake} flake.nix
- chmod 644 flake.nix
+ # Insert the nix flake
+ cp ${flake} flake.nix
+ chmod 644 flake.nix
- echo '/*' > .gitignore
- echo '!/.gitignore' >> .gitignore
- echo '!/flake.nix' >> .gitignore
- echo '!/flake.lock' >> .gitignore
- echo 'use flake .${(if impure then " --impure" else "")}' > .envrc
+ echo '/*' > .gitignore
+ echo '!/.gitignore' >> .gitignore
+ echo '!/flake.nix' >> .gitignore
+ echo '!/flake.lock' >> .gitignore
+ echo 'use flake .${(if impure then " --impure" else "")}' > .envrc
- git add flake.nix .gitignore
- git commit -m "Setup initial flake"
+ git add flake.nix .gitignore
+ git commit -m "Setup initial flake"
- direnv allow
- eval "$(direnv export bash)"
+ direnv allow
+ eval "$(direnv export bash)"
- git add flake.lock
- git commit -m "Lock flakes"
- }
+ git add flake.lock
+ git commit -m "Lock flakes"
+ }
- run "$@"
- '';
+ run "$@"
+ '';
- git-flake-dir-clone = { flake, impure? false}: pkgs.writeShellScript "git-nix-clone" ''
- # Input is a git repository such as git@github.com:group/project-name.git
- run() {
- local repo="$1"
- local projectName=$(echo "$repo" | sed 's/.*\///' | sed 's/\.git//')
+ git-flake-dir-clone =
+ {
+ flake,
+ impure ? false,
+ }:
+ pkgs.writeShellScript "git-nix-clone" ''
+ # Input is a git repository such as git@github.com:group/project-name.git
+ run() {
+ local repo="$1"
+ local projectName=$(echo "$repo" | sed 's/.*\///' | sed 's/\.git//')
- if [ "$repo" = "" ]; then
- echo "Usage: git-nix-clone "
- exit 1
- fi
+ if [ "$repo" = "" ]; then
+ echo "Usage: git-nix-clone "
+ exit 1
+ fi
- ${flake-dir {inherit flake impure;}} "$projectName"-nix
+ ${flake-dir { inherit flake impure; }} "$projectName"-nix
- git clone "$repo" "$projectName"-nix"/$projectName"
- }
+ git clone "$repo" "$projectName"-nix"/$projectName"
+ }
- run "$@"
- '';
+ run "$@"
+ '';
in
{
programs.zsh.shellAliases = {
- git-c3c-clone = lib.mkDefault "${git-flake-dir-clone { flake = ./flake-templates/c3c-flake.nix; impure = false;}}";
- flake-dir-c3c = lib.mkDefault "${flake-dir { flake = ./flake-templates/c3c-flake.nix; impure = false;}}";
- flake-dir-yp = lib.mkDefault "${flake-dir { flake = ./flake-templates/yp-flake.nix; impure = false;}}";
- flake-dir-investbay = lib.mkDefault "${flake-dir { flake = ./flake-templates/investbay-flake.nix; impure = false;}}";
+ git-c3c-clone = lib.mkDefault "${git-flake-dir-clone {
+ flake = ./flake-templates/c3c-flake.nix;
+ impure = true;
+ }}";
+ flake-dir-c3c = lib.mkDefault "${flake-dir {
+ flake = ./flake-templates/c3c-flake.nix;
+ impure = true;
+ }}";
+ flake-dir-yp = lib.mkDefault "${flake-dir {
+ flake = ./flake-templates/yp-flake.nix;
+ impure = false;
+ }}";
+ flake-dir-investbay = lib.mkDefault "${flake-dir {
+ flake = ./flake-templates/investbay-flake.nix;
+ impure = false;
+ }}";
};
}