diff --git a/configuration.nix b/configuration.nix index 59ebea5..4afca8d 100644 --- a/configuration.nix +++ b/configuration.nix @@ -10,7 +10,7 @@ let GAPS_OUT = "10"; BORDER_WIDTH = "2"; BORDER_WIDTH_INT = 2; - test error boo! + this will fail to compile # Colours BG = "282828"; BG0_H = "1d2021"; diff --git a/edit-config.sh b/edit-config.sh index c384c50..ad31538 100755 --- a/edit-config.sh +++ b/edit-config.sh @@ -1,4 +1,4 @@ -sudo emacs /etc/nixos/configuration.nix +sudo emacs /etc/nixos/configuration.nix -nw sudo nixos-rebuild switch &>nixos-switch.log || ( cat nixos-switch.log | grep --color error && false) gen=$(nixos-rebuild list-generations | grep current) @@ -8,6 +8,6 @@ git commit -m "$gen" if (cat nixos-switch.log | grep error = ""); then git push else - echo "There was an error in your Nix Config" + echo "\033[0;31mThere was an error in your Nix Config, please fix it before you push to git\033[0m" fi diff --git a/nixos-switch.log b/nixos-switch.log index 56cad5e..72267f5 100644 --- a/nixos-switch.log +++ b/nixos-switch.log @@ -24,9 +24,9 @@ error: at /etc/nixos/configuration.nix:13:7: 12| BORDER_WIDTH_INT = 2; - 13| test error boo! + 13| this will fail to compile | ^ - 14| # Colours + 14| # Colours building Nix... error: … while evaluating the attribute 'config' @@ -54,9 +54,9 @@ error: at /etc/nixos/configuration.nix:13:7: 12| BORDER_WIDTH_INT = 2; - 13| test error boo! + 13| this will fail to compile | ^ - 14| # Colours + 14| # Colours building the system configuration... error: … while evaluating the attribute 'config.system.build.toplevel' @@ -84,6 +84,6 @@ error: at /etc/nixos/configuration.nix:13:7: 12| BORDER_WIDTH_INT = 2; - 13| test error boo! + 13| this will fail to compile | ^ - 14| # Colours + 14| # Colours