spread out lix source url

enable sane for scanning
flake.lock: Update
2024-11-12 18:43:15 -06:00 · 2024-08-06 12:43:56 -05:00 · 2024-08-06 12:38:20 -05:00 · 2024-08-06 17:10:58 +00:00 · 2024-08-06 12:07:01 -05:00 · 2024-08-06 11:58:11 -05:00
7 changed files with 77 additions and 83 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -34,6 +34,7 @@ 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

@ -57,7 +58,7 @@ jobs:
            build --minimal \
              --host "${{ inputs.hosts }}" \
              --flake . \
-              --verbose \
              --debug \
              -- \
+              --keep-going \
              --print-build-logs
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@ -22,6 +22,7 @@ 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

@ -43,7 +44,6 @@ jobs:
            build --minimal \
              --host "othalan" \
              --flake . \
-              --verbose \
              --debug \
              -- \
              --print-build-logs
@ -71,6 +71,7 @@ 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

@ -86,7 +87,6 @@ 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

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

    lix.url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
    lix.flake = false;
@ -23,37 +20,23 @@

    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";

-    zig2nix = {
-      url = "github:Cloudef/zig2nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    zls = {
-      url = "github:zigtools/zls";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    pixi.url = "github:daylinmorgan/pixi-flake";
+    f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake";
+    tsm.url = "github:daylinmorgan/tsm?dir=nix";
+    hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git";

-    roc = {
-      url = "github:roc-lang/roc";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    pixi = {
-      url = "github:daylinmorgan/pixi-flake";
-      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";
-    };
+    hyprman.inputs.nixpkgs.follows = "nixpkgs";
+    f1multiviewer.inputs.nixpkgs.follows = "nixpkgs";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
+    pixi.inputs.nixpkgs.follows = "nixpkgs";
+    roc.inputs.nixpkgs.follows = "nixpkgs";
+    tsm.inputs.nixpkgs.follows = "nixpkgs";
+    zls.inputs.nixpkgs.follows = "nixpkgs";
+    zig2nix.inputs.nixpkgs.follows = "nixpkgs";
  };

  nixConfig = {
--- a/hosts/othalan/system.nix
+++ b/hosts/othalan/system.nix
@ -1,12 +1,17 @@
 { 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;
--- a/modules/nix.nix
+++ b/modules/nix.nix
@ -14,18 +14,29 @@ in

  nixpkgs.config.allowUnfree = true;
  # nix.package = pkgs.nixVersions.latest;
-  nix.extraOptions = ''
-    experimental-features = nix-command flakes
-    use-xdg-base-directories = true
-  '';
+  nix = {
+    extraOptions = ''
+      experimental-features = nix-command flakes
+      use-xdg-base-directories = true
+    '';

-  nix.optimise.automatic = true;
-  nix.gc = {
-    automatic = true;
-    dates = "weekly";
-    options = "--delete-older-than 7d";
+    optimise.automatic = true;
+    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
--- a/pkgs/oizys/internal/github/main.go
+++ b/pkgs/oizys/internal/github/main.go
@ -9,6 +9,7 @@ import (
 	"net/http"
 	"net/url"
 	"oizys/internal/oizys"
+	"strings"

 	"github.com/charmbracelet/log"
 	"github.com/google/go-github/v63/github"
@ -154,17 +155,10 @@ 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(
Author	SHA1	Message	Date
Daylin Morgan	7fe4f7bd55	spread out lix source url	2024-08-06 12:43:56 -05:00
Daylin Morgan	a329763cba	enable sane for scanning	2024-08-06 12:38:20 -05:00
daylin-bot	79984d5ddc	flake.lock: Update Flake lock file updates: • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=2b520571e897be2a0e88c8692da607b062000038' (2024-08-04) → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=b0a70f63e3865eaa77f0b78a04b230aa583bc95c' (2024-08-06) • Updated input 'lix': '`66469fc281`.tar.gz?narHash=sha256-FrM0DN/i5kKB06/4KYNkY3mMGpC5hYQhaKtx1mneReU%3D' (2024-08-03) → '`f84997cbef`.tar.gz?narHash=sha256-cEemTAXvhRcjn7XxujIRglqEfAFgdlNulkRSFskowbo%3D' (2024-08-06) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/81610abc161d4021b29199aa464d6a1a521e0cc9' (2024-08-02) → 'github:nixos/nixpkgs/d33cf80b603b3d0cddb48f9816cae707a59e2334' (2024-08-06) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/7ff73584dfac4799a253e38c2aedae80b681dd7f' (2024-08-04) → 'github:nix-community/nixpkgs-wayland/423d21c157c2a7b384ae9c766e25759576dceb87' (2024-08-06) • Updated input 'nixpkgs-wayland/nixpkgs': 'github:nixos/nixpkgs/d04953086551086b44b6f3c6b7eeb26294f207da' (2024-08-02) → 'github:nixos/nixpkgs/cb9a96f23c491c081b38eab96d22fa958043c9fa' (2024-08-04) • Updated input 'roc': 'github:roc-lang/roc/d4d9f69d0fbefd331172c11e430a5f2ac98ee30b' (2024-08-04) → 'github:roc-lang/roc/13f60cde09ef01c003fe362bf46e592a0f4ae7c6' (2024-08-05) • Updated input 'zig2nix': 'github:Cloudef/zig2nix/c45829191ae509708b929872845f75008942d9b5' (2024-08-04) → 'github:Cloudef/zig2nix/32c6285061bbab4920b020ec9e9f4aa5c9a81750' (2024-08-06) • Updated input 'zls': 'github:zigtools/zls/dfe958e4d1a9ba503cfafd39164f090daea70109' (2024-08-03) → 'github:zigtools/zls/74b5a00f67ab4e5a848646411779221e6cc24b87' (2024-08-06)	2024-08-06 17:10:58 +00:00
Daylin Morgan	db01189615	remove verbose	2024-08-06 12:07:01 -05:00
Daylin Morgan	da682c0073	change how flake.nix is organized	2024-08-06 11:58:11 -05:00
Daylin Morgan	df4da6b3f9	leave this comments in case I run into unexpected nix-shell outputs	2024-08-06 11:41:39 -05:00
Daylin Morgan	cb31371784	try to use lix	2024-08-06 10:22:27 -05:00
Daylin Morgan	0a54af8cc7	use the same nixpkgs	2024-08-06 10:02:54 -05:00
Daylin Morgan	e4a304c274	support non-extension file name	2024-08-06 10:02:54 -05:00
Daylin Morgan	91a370de41	no more verbose flag	2024-08-06 10:02:54 -05:00