.github/workflows/build.yml

@@ -34,7 +34,6 @@ jobs:
 
       - uses: DeterminateSystems/nix-installer-action@v13
         with:
-          source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
           extra-conf: |
             accept-flake-config = true
 
@@ -58,7 +57,7 @@ jobs:
             build --minimal \
               --host "${{ inputs.hosts }}" \
               --flake . \
+              --verbose \
               --debug \
               -- \
-              --keep-going \
               --print-build-logs

.github/workflows/update.yml

@@ -22,7 +22,6 @@ jobs:
 
       - uses: DeterminateSystems/nix-installer-action@v13
         with:
-          source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
           extra-conf: |
             accept-flake-config = true
 
@@ -44,6 +43,7 @@ jobs:
             build --minimal \
               --host "othalan" \
               --flake . \
+              --verbose \
               --debug \
               -- \
               --print-build-logs
@@ -71,7 +71,6 @@ jobs:
 
       - uses: DeterminateSystems/nix-installer-action@v13
         with:
-          source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
           extra-conf: |
             accept-flake-config = true
 
@@ -87,6 +86,7 @@ jobs:
             -- \
             build $system_attr \
               --flake . \
+              --verbose \
               --debug \
               -- \
               --print-build-logs \
@@ -101,9 +101,9 @@ jobs:
             -- \
             build $system_attr \
               --flake . \
+              --verbose \
               --debug \
               -- \
-              --keep-going \
               --print-build-logs \
               --out-link updated
 

flake.lock

@@ -341,11 +341,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1722956902,
+        "lastModified": 1722800434,
-        "narHash": "sha256-g3cAlVmRtnyqMZw88MKqVNM8eU88XzgNAlXdTkym5q8=",
+        "narHash": "sha256-0lvzOT3dQWlQ+zyOAhKTxFd9BWZw380ILDNpoGdtekA=",
         "ref": "refs/heads/main",
-        "rev": "b0a70f63e3865eaa77f0b78a04b230aa583bc95c",
+        "rev": "2b520571e897be2a0e88c8692da607b062000038",
-        "revCount": 5055,
+        "revCount": 5051,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland/"
@@ -534,11 +534,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1722957485,
+        "lastModified": 1722643724,
-        "narHash": "sha256-cEemTAXvhRcjn7XxujIRglqEfAFgdlNulkRSFskowbo=",
+        "narHash": "sha256-FrM0DN/i5kKB06/4KYNkY3mMGpC5hYQhaKtx1mneReU=",
-        "rev": "f84997cbefb2f2dd99e48f0ad39f747ed83d69e9",
+        "rev": "66469fc281fc4abb3284574f77a8051fee8116b9",
         "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f84997cbefb2f2dd99e48f0ad39f747ed83d69e9.tar.gz"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/66469fc281fc4abb3284574f77a8051fee8116b9.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -715,11 +715,11 @@
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1722928655,
+        "lastModified": 1722802723,
-        "narHash": "sha256-2BAfUaRzrhHwT/JodTq++DUf/nljgoFEc5A79SS8ydU=",
+        "narHash": "sha256-7Yrsx/qbGCojDFxHSMsehU6a9z8rHCUVgjalKxPW4Eg=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "423d21c157c2a7b384ae9c766e25759576dceb87",
+        "rev": "7ff73584dfac4799a253e38c2aedae80b681dd7f",
         "type": "github"
       },
       "original": {
@@ -762,11 +762,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1722926584,
+        "lastModified": 1722640603,
-        "narHash": "sha256-sLA+lfCxTkXf4o3JVxcfe+w9kAzauGfEnJ9roNbNng8=",
+        "narHash": "sha256-TcXjLVNd3VeH1qKPH335Tc4RbFDbZQX+d7rqnDUoRaY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d33cf80b603b3d0cddb48f9816cae707a59e2334",
+        "rev": "81610abc161d4021b29199aa464d6a1a521e0cc9",
         "type": "github"
       },
       "original": {
@@ -794,11 +794,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1722813957,
+        "lastModified": 1722630782,
-        "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
+        "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
+        "rev": "d04953086551086b44b6f3c6b7eeb26294f207da",
         "type": "github"
       },
       "original": {
@@ -857,11 +857,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1722856566,
+        "lastModified": 1722735731,
-        "narHash": "sha256-Yr9P/TyxgVVwgXIiu96up2hgWjMR0zWPbaihyNXp+r0=",
+        "narHash": "sha256-BN/+/y1zR3sU4KhTdfNkleYS79UEnnmKP9MmY4NHZ8M=",
         "owner": "roc-lang",
         "repo": "roc",
-        "rev": "13f60cde09ef01c003fe362bf46e592a0f4ae7c6",
+        "rev": "d4d9f69d0fbefd331172c11e430a5f2ac98ee30b",
         "type": "github"
       },
       "original": {
@@ -1156,11 +1156,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722907357,
+        "lastModified": 1722734830,
-        "narHash": "sha256-alp8wfWJtxLXKNuVXPjhWFtrGhp10/3Nle//1RkapgU=",
+        "narHash": "sha256-cTHYCv/I2P6/V9pUZ9iqwjr/9VIZ4f+aRqZJq6DWsac=",
         "owner": "Cloudef",
         "repo": "zig2nix",
-        "rev": "32c6285061bbab4920b020ec9e9f4aa5c9a81750",
+        "rev": "c45829191ae509708b929872845f75008942d9b5",
         "type": "github"
       },
       "original": {
@@ -1180,11 +1180,11 @@
         "zig-overlay": "zig-overlay"
       },
       "locked": {
-        "lastModified": 1722919037,
+        "lastModified": 1722703886,
-        "narHash": "sha256-h8BG+XOCli8++tCojSo/cF39AIixVj3mO94b4cuqT94=",
+        "narHash": "sha256-WtOixxAwZS1uTD5L66ms9ctA7gUdEIfzbsY1Gj+aV+4=",
         "owner": "zigtools",
         "repo": "zls",
-        "rev": "74b5a00f67ab4e5a848646411779221e6cc24b87",
+        "rev": "dfe958e4d1a9ba503cfafd39164f090daea70109",
         "type": "github"
       },
       "original": {

flake.nix

@@ -8,7 +8,10 @@
     stable.url = "github:nixos/nixpkgs/nixos-23.11";
     nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
     nixos-wsl.url = "github:nix-community/NixOS-WSL";
-    nix-index-database.url = "github:nix-community/nix-index-database";
+    nix-index-database = {
+      url = "github:nix-community/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     lix.url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
     lix.flake = false;
@@ -20,23 +23,37 @@
 
     hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1";
     hyprland-contrib.url = "github:hyprwm/contrib";
-    roc.url = "github:roc-lang/roc";
-    zig2nix.url = "github:Cloudef/zig2nix";
-    zls.url = "github:zigtools/zls";
 
-    pixi.url = "github:daylinmorgan/pixi-flake";
+    zig2nix = {
-    f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake";
+      url = "github:Cloudef/zig2nix";
-    tsm.url = "github:daylinmorgan/tsm?dir=nix";
+      inputs.nixpkgs.follows = "nixpkgs";
-    hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git";
+    };
+    zls = {
+      url = "github:zigtools/zls";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    hyprman.inputs.nixpkgs.follows = "nixpkgs";
+    roc = {
-    f1multiviewer.inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:roc-lang/roc";
-    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
-    pixi.inputs.nixpkgs.follows = "nixpkgs";
+    };
-    roc.inputs.nixpkgs.follows = "nixpkgs";
+
-    tsm.inputs.nixpkgs.follows = "nixpkgs";
+    pixi = {
-    zls.inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:daylinmorgan/pixi-flake";
-    zig2nix.inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    f1multiviewer = {
+      url = "github:daylinmorgan/f1multiviewer-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    tsm = {
+      url = "github:daylinmorgan/tsm?dir=nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    hyprman = {
+      url = "git+https://git.dayl.in/daylin/hyprman.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   nixConfig = {

hosts/othalan/system.nix

@@ -1,17 +1,12 @@
 { pkgs, enabled, ... }:
 {
   networking.networkmanager = enabled;
+  services.printing = enabled;
   services.fwupd = enabled;
   hardware.bluetooth = enabled // {
     powerOnBoot = true;
   };
 
-  services.printing = enabled;
-  hardware.sane = enabled // {
-    extraBackends = [ pkgs.hplipWithPlugin ];
-  };
-  users.users.daylin.extraGroups = ["scanner" "lp"];
-
   # https://github.com/NixOS/nixos-hardware/blob/c478b3d56969006e015e55aaece4931f3600c1b2/lenovo/thinkpad/x1/9th-gen/default.nix
   # https://github.com/NixOS/nixos-hardware/blob/c478b3d56969006e015e55aaece4931f3600c1b2/common/pc/ssd/default.nix
   services.fstrim = enabled;

modules/nix.nix

@@ -14,29 +14,18 @@ in
 
   nixpkgs.config.allowUnfree = true;
   # nix.package = pkgs.nixVersions.latest;
-  nix = {
+  nix.extraOptions = ''
-    extraOptions = ''
     experimental-features = nix-command flakes
     use-xdg-base-directories = true
   '';
 
-    optimise.automatic = true;
+  nix.optimise.automatic = true;
-    gc = {
+  nix.gc = {
     automatic = true;
     dates = "weekly";
     options = "--delete-older-than 7d";
   };
 
-    # use the same nixpkgs for nix run "nixpkgs#hello" style commands
-    registry.nixpkgs.flake = inputs.nixpkgs;
-  };
-
-  # https://dataswamp.org/~solene/2022-07-20-nixos-flakes-command-sync-with-system.html#_nix-shell_vs_nix_shell
-  # use the same nixpkgs for nix-shell -p hello style commands
-  # I don't know that this is necesary...
-  # nix.nixPath = [ "nixpkgs=/etc/channels/nixpkgs" ];
-  # environment.etc."channels/nixpkgs".source = inputs.nixpkgs.outPath;
-
   environment.systemPackages = [
     pkgs.nixd
     pkgs.nixfmt-rfc-style

pkgs/oizys/internal/github/main.go

@@ -9,7 +9,6 @@ import (
 	"net/http"
 	"net/url"
 	"oizys/internal/oizys"
-	"strings"
 
 	"github.com/charmbracelet/log"
 	"github.com/google/go-github/v63/github"
@@ -155,10 +154,17 @@ func ReadMarkdownFromZip(zipData []byte, fileName string) (string, error) {
 	return string(content), nil
 }
 
+// func CI(rest ...string) {
+// 	args := []string{
+// 		"workflow", "run", "build.yml",
+// 		"-F", fmt.Sprintf("hosts=%s", o.host),
+// 	}
+// 	args = append(args, rest...)
+// 	cmd := exec.Command("gh", args...)
+// 	e.ExitWithCommand(cmd)
+// }
+
 func CreateDispatch(workflowFileName string, ref string, inputs map[string]interface{}) {
-	if !strings.HasSuffix(workflowFileName, ".yml") && !strings.HasSuffix(workflowFileName, ".yaml") {
-		workflowFileName = workflowFileName + ".yml"
-	}
 	log.Infof("creating dispatch event for %s", workflowFileName)
 	event := github.CreateWorkflowDispatchEventRequest{Ref: ref, Inputs: inputs}
 	_, err := client.Actions.CreateWorkflowDispatchEventByFileName(