From bfbe06e81c431514477cf47b31f5a2e9b9a91cd7 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Fri, 25 Oct 2024 11:09:21 -0400 Subject: [PATCH] updated versions --- bin/skyg | 17 ++++++++++------- flake.lock | 30 +++++++++++++++--------------- hosts/fwbook.nix | 4 +++- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/bin/skyg b/bin/skyg index 79da3fc..8e98513 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,7 +60,10 @@ function run-rollback() { function run-update() { : Updates a single flake and runs update : Usage: skyg update {name-of-input} - nix flake lock --update-input ${1} + echo "updating ${1}" + cmd="nix flake lock --update-input ${1}" + echo $cmd + $cmd run-update } @@ -91,16 +94,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 @@ -110,7 +113,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/flake.lock b/flake.lock index 5c56328..71d0c5e 100644 --- a/flake.lock +++ b/flake.lock @@ -266,11 +266,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728696962, - "narHash": "sha256-zhLDfVImuWQgwczQ+pxdwteWPiULTwYLzJNGluwcO4A=", + "lastModified": 1729857853, + "narHash": "sha256-IVaFOTG4i2K0YWKrJui09YCAEWyTSK+zaUTUvj/SbC4=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "b744a190a610460e51fd2dbd10cf2bfc42711fe8", + "rev": "04408bf4afe2bf2b15227c43914130c8bdf4ed3c", "type": "github" }, "original": { @@ -297,11 +297,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728328465, - "narHash": "sha256-a0a0M1TmXMK34y3M0cugsmpJ4FJPT/xsblhpiiX1CXo=", + "lastModified": 1729449015, + "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1bfbbbe5bbf888d675397c66bfdb275d0b99361c", + "rev": "89172919243df199fe237ba0f776c3e3e3d72367", "type": "github" }, "original": { @@ -313,11 +313,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728627514, - "narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=", + "lastModified": 1729691686, + "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c505ebf777526041d792a49d5f6dd4095ea391a7", + "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37", "type": "github" }, "original": { @@ -348,11 +348,11 @@ ] }, "locked": { - "lastModified": 1728613723, - "narHash": "sha256-zVVj0PKguM8ZMdLE43YW7dzer3tl9e6i5Qs1fr878+c=", + "lastModified": 1729736953, + "narHash": "sha256-Rb6JUop7NRklg0uzcre+A+Ebrn/ZiQPkm4QdKg6/3pw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ca93f28abd2147dd9997261dcaeacc5a30dba463", + "rev": "29b1275740d9283467b8117499ec8cbb35250584", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "unstable": { "locked": { - "lastModified": 1728738154, - "narHash": "sha256-BKniFdCCST/4gmDPjHgfVOOvCyVk5sp3PX+f4SKSFM0=", + "lastModified": 1729776061, + "narHash": "sha256-9uxnD2AAz5kZq7MAhvMy2pPl8v6TW8CBRSdES84dH+M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54cce652cb480258b12f15b2915e7a6c79ac51ae", + "rev": "15aad9d3a13dfe03be4aaa0676ecd79a16885cf2", "type": "github" }, "original": { diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 18038d3..c0f2945 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -10,7 +10,8 @@ in { imports = [ ./fwbook.hardware-configuration.nix ]; # Skyg - skyg = { + environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1; + skyg = { user.enable = true; server.admin.enable = true; core.qemu.enable = true; @@ -78,6 +79,7 @@ in dvc-with-remotes google-cloud-sdk awscli + google-chrome # Photo Editing krita gimp-with-plugins