diff --git a/configuration.nix b/configuration.nix index f2d6139..24c0675 100644 --- a/configuration.nix +++ b/configuration.nix @@ -10,6 +10,7 @@ let GAPS_OUT = "10"; BORDER_WIDTH = "2"; BORDER_WIDTH_INT = 2; + error # Colours BG = "282828"; BG0_H = "1d2021"; diff --git a/edit-config.sh b/edit-config.sh index 98d503a..54148cd 100755 --- a/edit-config.sh +++ b/edit-config.sh @@ -5,7 +5,7 @@ gen=$(nixos-rebuild list-generations | grep current) sudo cp /etc/nixos/configuration.nix . git add . git commit -m "$gen" -if (cat nixos-switch.log | grep error = ""); then +if grep -q "error" nixos-switch.log; then git push else echo "There was an error in your Nix Config, please fix it before you push to git" diff --git a/nixos-switch.log b/nixos-switch.log index db774bf..75f37a7 100644 --- a/nixos-switch.log +++ b/nixos-switch.log @@ -1,7 +1,89 @@ +error: + … while evaluating the attribute 'config' + + at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/modules.nix:322:9: + + 321| options = checked options; + 322| config = checked (removeAttrs config [ "_module" ]); + | ^ + 323| _module = checked (config._module); + + … while calling the 'seq' builtin + + at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/modules.nix:322:18: + + 321| options = checked options; + 322| config = checked (removeAttrs config [ "_module" ]); + | ^ + 323| _module = checked (config._module); + + (stack trace truncated; use '--show-trace' to show the full trace) + + error: syntax error, unexpected ID, expecting '.' or '=' + + at /etc/nixos/configuration.nix:15:2: + + 14| # Colours + 15| BG = "282828"; + | ^ + 16| BG0_H = "1d2021"; building Nix... +error: + … while evaluating the attribute 'config' + + at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/modules.nix:322:9: + + 321| options = checked options; + 322| config = checked (removeAttrs config [ "_module" ]); + | ^ + 323| _module = checked (config._module); + + … while calling the 'seq' builtin + + at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/modules.nix:322:18: + + 321| options = checked options; + 322| config = checked (removeAttrs config [ "_module" ]); + | ^ + 323| _module = checked (config._module); + + (stack trace truncated; use '--show-trace' to show the full trace) + + error: syntax error, unexpected ID, expecting '.' or '=' + + at /etc/nixos/configuration.nix:15:2: + + 14| # Colours + 15| BG = "282828"; + | ^ + 16| BG0_H = "1d2021"; building the system configuration... -activating the configuration... -setting up /etc... -reloading user units for lightdm... -reloading user units for deadvey... -restarting sysinit-reactivation.target +error: + … while evaluating the attribute 'config.system.build.toplevel' + + at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/modules.nix:322:9: + + 321| options = checked options; + 322| config = checked (removeAttrs config [ "_module" ]); + | ^ + 323| _module = checked (config._module); + + … while calling the 'seq' builtin + + at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/modules.nix:322:18: + + 321| options = checked options; + 322| config = checked (removeAttrs config [ "_module" ]); + | ^ + 323| _module = checked (config._module); + + (stack trace truncated; use '--show-trace' to show the full trace) + + error: syntax error, unexpected ID, expecting '.' or '=' + + at /etc/nixos/configuration.nix:15:2: + + 14| # Colours + 15| BG = "282828"; + | ^ + 16| BG0_H = "1d2021";