flake.lock: Update

Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=407453166ce2a52433c7b0b4ee92a41e47ef8f6d' (2025-01-19)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=a661203bb6d4714b211572759e2f74b1da194972' (2025-01-20)
• Updated input 'lix':
    '4bb97b2a9b.tar.gz?narHash=sha256-Gt0o5Reh1Pm/1Bf5QawWWbEB6A1kExmc9Wva4bq8Bx8%3D&rev=4bb97b2a9b4e96b825e621810900ce077fdf7efb' (2025-01-19)
  → '831e9d62f1.tar.gz?narHash=sha256-szM%2BhEGCKFiPxWkKCXqA0oIGmlfbHupsk4b1uss1zuk%3D&rev=831e9d62f118dc6180901a762e25d04fde064595' (2025-01-20)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/0deffe038aebb272bd19a514e780a09e24da8417' (2025-01-20)
  → 'github:nix-community/nixpkgs-wayland/900b3dbd52e89c7dde737e50c51ee97e93ee4d9e' (2025-01-20)

.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: |

flake.lock

@@ -7,17 +7,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1732406038,
+        "lastModified": 1736736253,
-        "narHash": "sha256-BYNBN+Rtc/SX6qI7m3nmryufRPn0ZYd40yHDo9VQaNE=",
+        "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"
       }
     },
@@ -235,11 +235,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1737310896,
+        "lastModified": 1737398451,
-        "narHash": "sha256-Y0s1jBm18Dl9HKpXsLG0fN9Co2IKoGqtriZ/2Vncv5s=",
+        "narHash": "sha256-9X6dQbYGi9az9+8wk3fnPppD2SOOe6U68vdZCl+MxkE=",
         "ref": "refs/heads/main",
-        "rev": "407453166ce2a52433c7b0b4ee92a41e47ef8f6d",
+        "rev": "a661203bb6d4714b211572759e2f74b1da194972",
-        "revCount": 5690,
+        "revCount": 5693,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland/"
@@ -475,15 +475,15 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1737234286,
+        "lastModified": 1737400654,
-        "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=",
+        "narHash": "sha256-szM+hEGCKFiPxWkKCXqA0oIGmlfbHupsk4b1uss1zuk=",
-        "rev": "2837da71ec1588c1187d2e554719b15904a46c8b",
+        "rev": "831e9d62f118dc6180901a762e25d04fde064595",
         "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/831e9d62f118dc6180901a762e25d04fde064595.tar.gz?rev=831e9d62f118dc6180901a762e25d04fde064595"
       },
       "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": {
@@ -524,21 +524,23 @@
           "flake-utils"
         ],
         "flakey-profile": "flakey-profile",
-        "lix": "lix",
+        "lix": [
+          "lix"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1737237494,
+        "lastModified": 1737241037,
-        "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=",
+        "narHash": "sha256-6LIpS3rK1Ch6OXis4tvBTgGBTRb+NptDAfhPNzmgZSE=",
-        "rev": "b90bf629bbd835e61f1317b99e12f8c831017006",
+        "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": {
@@ -692,11 +694,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1737341314,
+        "lastModified": 1737390929,
-        "narHash": "sha256-cLtRowBc6OUcOSgGkwle70mOW/UyCbxWUveK3iQUKzI=",
+        "narHash": "sha256-0G3+H+LH18eQXDnElM/Y/8BkUPoO9qc2jLh7aoI6tXA=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "0deffe038aebb272bd19a514e780a09e24da8417",
+        "rev": "900b3dbd52e89c7dde737e50c51ee97e93ee4d9e",
         "type": "github"
       },
       "original": {
@@ -735,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",

flake.nix

@@ -8,27 +8,21 @@
     stable.url = "github:nixos/nixpkgs/nixos-24.05";
     my-nixpkgs.url = "github:daylinmorgan/nixpkgs/nixos-unstable";
 
-    # lix = {
+    lix-module.url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
-    #   url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
+    lix-module.inputs.nixpkgs.follows = "nixpkgs";
-    #   flake = false;
+    lix-module.inputs.flake-utils.follows = "flake-utils";
-    # };
+    lix = {
-    # lix-module = {
+      url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
-    #   url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
+      flake = false;
-    #   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.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
 

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

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; })

modules/essentials.nix

@@ -28,6 +28,8 @@
   ];
 
   nixpkgs.config.allowUnfree = true;
+  nix.package = (flake.pkgs "self").lix;
+
   nix = {
     optimise.automatic = true;
     gc = {

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"

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;
+  })

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"