actually use the correct lix

try just disabling the checks
remove duplication
2025-02-05 05:04:18 -06:00 · 2025-01-20 13:15:49 -06:00 · 2025-01-20 12:51:44 -06:00 · 2025-01-20 12:31:02 -06:00 · 2025-01-20 12:03:32 -06:00 · 2025-01-20 12:03:13 -06:00
9 changed files with 97 additions and 71 deletions
--- a/.github/actions/nix/action.yml
+++ b/.github/actions/nix/action.yml
@ -36,6 +36,11 @@ runs:
      with:
        extra-conf: ${{ inputs.nix_conf }}

+    - name: modify trusted users
+      shell: bash
+      run: |
+        sudo echo "trusted-users = root $USER" >> /etc/nix/nix.conf
+
    - name: Install and login to attic cache
      shell: bash
      run: |
--- a/flake.lock
+++ b/flake.lock
@ -7,17 +7,17 @@
        ]
      },
      "locked": {
-        "lastModified": 1732406038,
-        "narHash": "sha256-BYNBN+Rtc/SX6qI7m3nmryufRPn0ZYd40yHDo9VQaNE=",
+        "lastModified": 1736736253,
+        "narHash": "sha256-GrktftEfXmmdKOU0yz3QXckDz1ncZ+f4KLU8XnYKYuA=",
        "owner": "AshleyYakeley",
        "repo": "NixVirt",
-        "rev": "fe3aaa86d4458e4f84348941297f7ba82e2a9f67",
+        "rev": "9063243af5e6674359a0ff7cec57f02eeacf0cea",
        "type": "github"
      },
      "original": {
        "owner": "AshleyYakeley",
        "repo": "NixVirt",
-        "rev": "fe3aaa86d4458e4f84348941297f7ba82e2a9f67",
+        "rev": "9063243af5e6674359a0ff7cec57f02eeacf0cea",
        "type": "github"
      }
    },
@ -89,6 +89,22 @@
        "type": "github"
      }
    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
    "flake-parts": {
      "inputs": {
        "nixpkgs-lib": [
@ -219,11 +235,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1737038559,
-        "narHash": "sha256-iSJIeZz2Bto/RiZN1scp4hfvnEAc+IhIRGxD2V3iu+c=",
+        "lastModified": 1737310896,
+        "narHash": "sha256-Y0s1jBm18Dl9HKpXsLG0fN9Co2IKoGqtriZ/2Vncv5s=",
        "ref": "refs/heads/main",
-        "rev": "0dc7367a7006cc3cc877d52bf34c4998144bff84",
-        "revCount": 5674,
+        "rev": "407453166ce2a52433c7b0b4ee92a41e47ef8f6d",
+        "revCount": 5690,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland/"
@ -266,11 +282,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1735774328,
-        "narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=",
+        "lastModified": 1737127640,
+        "narHash": "sha256-mIQ3/axCZ4g8ySwWRbW4fJcyC9v55uAii3cqlJRtW8g=",
        "owner": "hyprwm",
        "repo": "hyprland-protocols",
-        "rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb",
+        "rev": "455c055883d9639d4fcbfcedb4c6d12ce313791e",
        "type": "github"
      },
      "original": {
@ -443,11 +459,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1736684024,
-        "narHash": "sha256-FYJ4iFD/2L1CFN/aHjI8HxxSxuPNy4OvW+VCBh41Lzk=",
+        "lastModified": 1737288694,
+        "narHash": "sha256-e9MsdkHidgepQpF0InyRSpeD6YujQcaB0uUzeXVvW+I=",
        "owner": "nix-community",
        "repo": "lib-aggregate",
-        "rev": "917882a0186d7731a61ede986c701e272f744750",
+        "rev": "e07594822638004d96f100febbe947189c42e8a9",
        "type": "github"
      },
      "original": {
@ -459,20 +475,21 @@
    "lix": {
      "flake": false,
      "locked": {
-        "lastModified": 1737234286,
-        "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=",
-        "rev": "2837da71ec1588c1187d2e554719b15904a46c8b",
+        "lastModified": 1737301226,
+        "narHash": "sha256-Gt0o5Reh1Pm/1Bf5QawWWbEB6A1kExmc9Wva4bq8Bx8=",
+        "rev": "4bb97b2a9b4e96b825e621810900ce077fdf7efb",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/4bb97b2a9b4e96b825e621810900ce077fdf7efb.tar.gz?rev=4bb97b2a9b4e96b825e621810900ce077fdf7efb"
      },
      "original": {
        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz"
+        "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
      }
    },
    "lix-attic": {
      "inputs": {
        "crane": "crane",
+        "flake-compat": "flake-compat",
        "flake-parts": "flake-parts",
        "lix": [
          "lix-module",
@ -507,21 +524,23 @@
          "flake-utils"
        ],
        "flakey-profile": "flakey-profile",
-        "lix": "lix",
+        "lix": [
+          "lix"
+        ],
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1737237494,
-        "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=",
-        "rev": "b90bf629bbd835e61f1317b99e12f8c831017006",
+        "lastModified": 1737241037,
+        "narHash": "sha256-6LIpS3rK1Ch6OXis4tvBTgGBTRb+NptDAfhPNzmgZSE=",
+        "rev": "690f7c0fa2935bf591cccf4d7312b3e0f470298b",
        "type": "tarball",
-        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006"
+        "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/690f7c0fa2935bf591cccf4d7312b3e0f470298b.tar.gz?rev=690f7c0fa2935bf591cccf4d7312b3e0f470298b"
      },
      "original": {
        "type": "tarball",
-        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"
+        "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
      }
    },
    "my-nixpkgs": {
@ -567,11 +586,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1736652904,
-        "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=",
+        "lastModified": 1737257306,
+        "narHash": "sha256-lEGgpA4kGafc76+Amnz+gh1L/cwUS2pePFlf22WEyh8=",
        "owner": "nix-community",
        "repo": "nix-index-database",
-        "rev": "271e5bd7c57e1f001693799518b10a02d1123b12",
+        "rev": "744d330659e207a1883d2da0141d35e520eb87bd",
        "type": "github"
      },
      "original": {
@ -603,11 +622,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1736883708,
-        "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
+        "lastModified": 1737062831,
+        "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
+        "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
        "type": "github"
      },
      "original": {
@ -634,11 +653,11 @@
    },
    "nixpkgs-lib_2": {
      "locked": {
-        "lastModified": 1736643958,
-        "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
+        "lastModified": 1737248590,
+        "narHash": "sha256-6SWtDeYJS3bS7QyJrGKyd6FpROEN0JCMgakSX8yPbyA=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
+        "rev": "977f49fd8cf854416f82987696784717acd6e817",
        "type": "github"
      },
      "original": {
@ -675,11 +694,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1736965550,
-        "narHash": "sha256-u34e02DgidNBbJ2ZPUWlNZeqQTo7tCGT8LN9dZphNAY=",
+        "lastModified": 1737341314,
+        "narHash": "sha256-cLtRowBc6OUcOSgGkwle70mOW/UyCbxWUveK3iQUKzI=",
        "owner": "nix-community",
        "repo": "nixpkgs-wayland",
-        "rev": "8f3a889a1bb60d58f42fc671d8a0b73496ede51c",
+        "rev": "0deffe038aebb272bd19a514e780a09e24da8417",
        "type": "github"
      },
      "original": {
@ -718,6 +737,7 @@
        "hyprman": "hyprman",
        "jj": "jj",
        "lib-aggregate": "lib-aggregate",
+        "lix": "lix",
        "lix-attic": "lix-attic",
        "lix-module": "lix-module",
        "my-nixpkgs": "my-nixpkgs",
@ -763,11 +783,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1736808430,
-        "narHash": "sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk=",
+        "lastModified": 1737107480,
+        "narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "553c7cb22fed19fd60eb310423fdc93045c51ba8",
+        "rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6",
        "type": "github"
      },
      "original": {
@ -829,11 +849,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1737054102,
-        "narHash": "sha256-saLiCRQ5RtdTnznT/fja7GxcYRAzeY3k8S+IF/2s/2A=",
+        "lastModified": 1737103437,
+        "narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "97871d416166803134ba64597a1006f3f670fbde",
+        "rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -8,27 +8,21 @@
    stable.url = "github:nixos/nixpkgs/nixos-24.05";
    my-nixpkgs.url = "github:daylinmorgan/nixpkgs/nixos-unstable";

-    # lix = {
-    #   url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
-    #   flake = false;
-    # };
-    # lix-module = {
-    #   url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
-    #   inputs.nixpkgs.follows = "nixpkgs";
-    #   inputs.lix.follows = "lix";
-    # };
-    #
-    # keep for when lix breaks :/
-    lix-module = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
+    lix-module.url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
+    lix-module.inputs.nixpkgs.follows = "nixpkgs";
+    lix-module.inputs.flake-utils.follows = "flake-utils";
+    lix = {
+      url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
+      flake = false;
    };
+    lix-module.inputs.lix.follows = "lix";
+    # keep for when lix breaks :/
+    # lix-module.url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";

-    sops-nix.url = "github:Mic92/sops-nix";
-    nix-index-database.url = "github:nix-community/nix-index-database";
    treefmt-nix.url = "github:numtide/treefmt-nix";
    nixos-wsl.url = "github:nix-community/NixOS-WSL";
+    nix-index-database.url = "github:nix-community/nix-index-database";
+    sops-nix.url = "github:Mic92/sops-nix";
    hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1";
    hyprland-contrib.url = "github:hyprwm/contrib";
    nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
@ -41,7 +35,7 @@
    jj.url = "github:martinvonz/jj/v0.25.0";

    # master as of 2024.12.12
-    NixVirt.url = "github:AshleyYakeley/NixVirt?rev=fe3aaa86d4458e4f84348941297f7ba82e2a9f67";
+    NixVirt.url = "github:AshleyYakeley/NixVirt?rev=9063243af5e6674359a0ff7cec57f02eeacf0cea";

    # Follows

--- a/hosts/algiz/system.nix
+++ b/hosts/algiz/system.nix
@ -6,7 +6,7 @@
  # # added to make using `pip install` work in docker build
  # networking.nameservers = [ "8.8.8.8"];

-  # allow tcp connections for revsere proxy
+  # allow tcp connections for reverse proxy
  networking.firewall = enabled // {
    allowedTCPPorts = [
      80
--- a/lib/default.nix
+++ b/lib/default.nix
@ -65,7 +65,6 @@ let
        default = oizys;
        oizys = pkgs.callPackage ../pkgs/oizys { };
        iso = mkIso.config.system.build.isoImage;
-
        # nimlangserver = pkgs.callPackage ../pkgs/nim/nimlangserver { };
      }
      // (import ../pkgs { inherit pkgs lib; })
--- a/modules/essentials.nix
+++ b/modules/essentials.nix
@ -28,6 +28,8 @@
  ];

  nixpkgs.config.allowUnfree = true;
+  nix.package = (flake.pkgs "self").lix;
+
  nix = {
    optimise.automatic = true;
    gc = {
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@ -18,7 +18,7 @@ in

  attic-client = (flake.pkgs "lix-attic").attic-client;
  attic-server = (flake.pkgs "lix-attic").attic-server;
-  lix = (flake.pkgs "lix-module").default;
+  lix = pkgs.callPackage ./lix { inherit flake; };
 }
 // (flake.toPackageAttrs [
  "pixi"
--- a/pkgs/lix/default.nix
+++ b/pkgs/lix/default.nix
@ -0,0 +1,11 @@
+{ flake, ... }:
+((flake.pkgs "lix-module").default.override {
+  aws-sdk-cpp = null;
+}).overrideAttrs
+  (attrs: {
+    version = "${attrs.version}-oizys";
+
+    # probs a mistake ¯\_(ツ)_/¯
+    # surely they wouldn't push a broken CL....surely
+    doCheck = false;
+  })
--- a/pkgs/oizys/src/oizys/exec.nim
+++ b/pkgs/oizys/src/oizys/exec.nim
@ -62,19 +62,14 @@ proc formatStdoutStderr(stdout: string, stderr: string): string =
    result.add "-> "
    result.add line
    result.add "\n"
+
  result.add "stdout:\n"
  for line in stdout.splitLines():
    addLine
-    # result.add bb"[red]->[/]"
-    #  result.add "-> "
-    #  result.add line
-    #  result.add "\n"
+
  result.add "stdout:\n"
  for line in stderr.splitLines():
    addLine
-    result.add "-> "
-    result.add line
-    result.add "\n"
Author	SHA1	Message	Date
Daylin Morgan	05861c8a88	actually use the correct lix	2025-01-20 13:15:49 -06:00
Daylin Morgan	8c623e74e2	try just disabling the checks	2025-01-20 12:51:44 -06:00
Daylin Morgan	80825e833f	remove duplication	2025-01-20 12:31:02 -06:00
Daylin Morgan	927c1bbf6c	go back to lix main	2025-01-20 12:03:32 -06:00
Daylin Morgan	7c4cdd7906	try changing trusted users	2025-01-20 12:03:13 -06:00
Daylin Morgan	c40bc252d8	re-order	2025-01-20 11:43:49 -06:00
Daylin Morgan	c1a813f17b	typo	2025-01-20 11:38:16 -06:00
daylin-bot	433a4b8139	flake.lock: Update Flake lock file updates: • Updated input 'hyprland': 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=0dc7367a7006cc3cc877d52bf34c4998144bff84' (2025-01-16) → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=407453166ce2a52433c7b0b4ee92a41e47ef8f6d' (2025-01-19) • Updated input 'hyprland/hyprland-protocols': 'github:hyprwm/hyprland-protocols/e3b6af97ddcfaafbda8e2828c719a5af84f662cb' (2025-01-01) → 'github:hyprwm/hyprland-protocols/455c055883d9639d4fcbfcedb4c6d12ce313791e' (2025-01-17) • Updated input 'lib-aggregate': 'github:nix-community/lib-aggregate/917882a0186d7731a61ede986c701e272f744750' (2025-01-12) → 'github:nix-community/lib-aggregate/e07594822638004d96f100febbe947189c42e8a9' (2025-01-19) • Added input 'lix-attic/flake-compat': 'github:edolstra/flake-compat/ff81ac966bb2cae68946d5ed5fc4994f96d0ffec' (2024-12-04) • Updated input 'nix-index-database': 'github:nix-community/nix-index-database/271e5bd7c57e1f001693799518b10a02d1123b12' (2025-01-12) → 'github:nix-community/nix-index-database/744d330659e207a1883d2da0141d35e520eb87bd' (2025-01-19) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/eb62e6aa39ea67e0b8018ba8ea077efe65807dc8' (2025-01-14) → 'github:nixos/nixpkgs/5df43628fdf08d642be8ba5b3625a6c70731c19c' (2025-01-16) • Updated input 'nixpkgs-lib': 'github:nix-community/nixpkgs.lib/1418bc28a52126761c02dd3d89b2d8ca0f521181' (2025-01-12) → 'github:nix-community/nixpkgs.lib/977f49fd8cf854416f82987696784717acd6e817' (2025-01-19) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/8f3a889a1bb60d58f42fc671d8a0b73496ede51c' (2025-01-15) → 'github:nix-community/nixpkgs-wayland/0deffe038aebb272bd19a514e780a09e24da8417' (2025-01-20) • Updated input 'sops-nix': 'github:Mic92/sops-nix/553c7cb22fed19fd60eb310423fdc93045c51ba8' (2025-01-13) → 'github:Mic92/sops-nix/4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6' (2025-01-17) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/97871d416166803134ba64597a1006f3f670fbde' (2025-01-16) → 'github:numtide/treefmt-nix/d1ed3b385f8130e392870cfb1dbfaff8a63a1899' (2025-01-17)	2025-01-20 15:11:44 +00:00