diff --git a/bin/skyg b/bin/skyg index 8e98513..e90034c 100755 --- a/bin/skyg +++ b/bin/skyg @@ -45,10 +45,10 @@ function run-switch() { exit 1 fi fi - + sudo nixos-rebuild switch --flake . unlock - + } function run-rollback() { @@ -60,11 +60,14 @@ function run-rollback() { function run-update() { : Updates a single flake and runs update : Usage: skyg update {name-of-input} - echo "updating ${1}" - cmd="nix flake lock --update-input ${1}" - echo $cmd - $cmd - run-update + input_name=${1} + if [ ! -z $input_name ]; then + cmd="nix flake lock --update-input $input_name" + else + cmd="nix flake update" + fi + echo $cmd + $cmd } function run-diff() { @@ -94,16 +97,16 @@ function run-build-all() { : Builds all remote and local configurations : Usage: skyg build-all mkdir -p results - + nix flake show --json | jq -r -c '.nixosConfigurations | keys[]' | while read i; do echo "[[SKYG]] Building current $i" sudo nixos-rebuild build --flake .#$i rm -f results/$i-result mv result results/$i-result done - + nix flake update - + rm -f diffs mkdir diffs nix flake show --json | jq -r -c '.nixosConfigurations | keys[]' | while read i; do @@ -113,7 +116,7 @@ function run-build-all() { mv result results/$i-result-post nvd diff results/$i-result results/$i-result-post > diffs/$i done - + } diff --git a/modules/nixos/desktop/cosmic.nix b/modules/nixos/desktop/cosmic.nix index 6aef5fe..2f4e699 100644 --- a/modules/nixos/desktop/cosmic.nix +++ b/modules/nixos/desktop/cosmic.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: let cfg = config.skyg.nixos.desktop.cosmic; in @@ -10,6 +10,9 @@ in }; }; config = lib.mkIf cfg.enable { + environment.systemPackages = [ + pkgs.cosmic-icons + ]; services.desktopManager.cosmic.enable = true; # services.displayManager.cosmic-greeter.enable = true; };