From c60067f11200a5920c310c1c7410c39942dce2fb Mon Sep 17 00:00:00 2001 From: deadvey Date: Sat, 17 Aug 2024 11:53:22 +0100 Subject: [PATCH] 287 current 2024-08-17 11:33:49 24.05.3642.883180e6550c 6.6.44 * --- configuration.nix | 2 +- edit-config.sh | 7 +++---- nixos-switch.log | 12 ++++++------ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/configuration.nix b/configuration.nix index 052c46a..59ebea5 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 + test error boo! # Colours BG = "282828"; BG0_H = "1d2021"; diff --git a/edit-config.sh b/edit-config.sh index aaa2814..c384c50 100755 --- a/edit-config.sh +++ b/edit-config.sh @@ -2,13 +2,12 @@ sudo emacs /etc/nixos/configuration.nix sudo nixos-rebuild switch &>nixos-switch.log || ( cat nixos-switch.log | grep --color error && false) gen=$(nixos-rebuild list-generations | grep current) -log=$(cat nixos-switch.log) sudo cp /etc/nixos/configuration.nix . git add . git commit -m "$gen" -if ($log | grep error); then - echo "There was an error in your Nix Config" -else +if (cat nixos-switch.log | grep error = ""); then git push +else + echo "There was an error in your Nix Config" fi diff --git a/nixos-switch.log b/nixos-switch.log index b17bd66..56cad5e 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| test error boo! | ^ - 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| test error boo! | ^ - 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| test error boo! | ^ - 14| # Colours + 14| # Colours