try out lix for fun and profit

try out roc
2024-12-27 14:10:45 -06:00 · 2024-05-10 09:33:35 -05:00 · 2024-05-10 09:33:35 -05:00
5 changed files with 222 additions and 18 deletions
--- a/flake.lock
+++ b/flake.lock
@ -34,6 +34,22 @@
      }
    },
    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_3": {
      "flake": false,
      "locked": {
        "lastModified": 1673956053,
@ -111,6 +127,24 @@
      "inputs": {
        "systems": "systems_4"
      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_4": {
+      "inputs": {
+        "systems": "systems_5"
+      },
      "locked": {
        "lastModified": 1705309234,
        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
@ -125,9 +159,9 @@
        "type": "github"
      }
    },
-    "flake-utils_4": {
+    "flake-utils_5": {
      "inputs": {
-        "systems": "systems_5"
+        "systems": "systems_6"
      },
      "locked": {
        "lastModified": 1710146030,
@ -143,7 +177,7 @@
        "type": "github"
      }
    },
-    "flake-utils_5": {
+    "flake-utils_6": {
      "locked": {
        "lastModified": 1659877975,
        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@ -233,11 +267,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1715094470,
-        "narHash": "sha256-5m2mh5UbZLv54W0jvELt5l0xXE13yt+X2wtKjIvzQPI=",
+        "lastModified": 1715088506,
+        "narHash": "sha256-8KUE4xi+kTgnZtlNf+I7U95NbIlbxK9uR9kKpSA+5Lk=",
        "ref": "refs/heads/main",
-        "rev": "6ccc22194ca2d16bd7dc4b7263f897a547c50e6b",
-        "revCount": 4628,
+        "rev": "ec092bd601d9d351ff6ca34bd97f12055b2a4dd9",
+        "revCount": 4627,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
@ -403,11 +437,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1715038983,
-        "narHash": "sha256-DCZbFoNM8sx6YhEtu/xkNZfRwEt7RucJr3zuVVkugIw=",
+        "lastModified": 1715278311,
+        "narHash": "sha256-Z787hdZuwBhQCQOeOmln5j9cCKxDWql7tbF1ukKDFZU=",
        "ref": "refs/heads/main",
-        "rev": "aaf759cd93d1946336247808e7551df714cfd332",
-        "revCount": 70,
+        "rev": "c8ab1e79ba0140bc75731c75177242089506260b",
+        "revCount": 75,
        "type": "git",
        "url": "https://git.lix.systems/lix-project/nixos-module"
      },
@ -479,6 +513,31 @@
        "type": "github"
      }
    },
+    "nixgl": {
+      "inputs": {
+        "flake-utils": [
+          "roc",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "roc",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1710868679,
+        "narHash": "sha256-V1o2bCZdeYKP/0zgVp4EN0KUjMItAMk6J7SvCXUI5IU=",
+        "owner": "guibou",
+        "repo": "nixGL",
+        "rev": "d709a8abcde5b01db76ca794280745a43c8662be",
+        "type": "github"
+      },
+      "original": {
+        "owner": "guibou",
+        "repo": "nixGL",
+        "type": "github"
+      }
+    },
    "nixpkgs": {
      "locked": {
        "lastModified": 1712163089,
@ -611,6 +670,64 @@
        "type": "github"
      }
    },
+    "nixpkgs_7": {
+      "locked": {
+        "lastModified": 1712163089,
+        "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
+        "type": "github"
+      }
+    },
+    "pinix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709390347,
+        "narHash": "sha256-C7RDQ1xPktZGf8eSDUeZ2ZKetHtM2VJA0C10z0d8tkw=",
+        "owner": "remi-dupre",
+        "repo": "pinix",
+        "rev": "6f7dc0fccb0e48176629d061b07576d092a5d09c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "remi-dupre",
+        "repo": "pinix",
+        "type": "github"
+      }
+    },
+    "roc": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils_3",
+        "nixgl": "nixgl",
+        "nixpkgs": "nixpkgs_7",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1715347272,
+        "narHash": "sha256-kn6FNrKcsIoxG5PTZCTv/8GM5Cmw5LuCIAupNS276g8=",
+        "owner": "roc-lang",
+        "repo": "roc",
+        "rev": "e57a0a816400bb5827733e61b9e6168036da59cc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "roc-lang",
+        "repo": "roc",
+        "type": "github"
+      }
+    },
    "root": {
      "inputs": {
        "f1multiviewer": "f1multiviewer",
@ -621,11 +738,55 @@
        "nix-index-database": "nix-index-database",
        "nixpkgs": "nixpkgs_4",
        "nixpkgs-wayland": "nixpkgs-wayland",
+        "pinix": "pinix",
+        "roc": "roc",
+        "stable": "stable",
        "tsm": "tsm",
        "zig2nix": "zig2nix",
        "zls": "zls"
      }
    },
+    "rust-overlay": {
+      "inputs": {
+        "flake-utils": [
+          "roc",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "roc",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1712369449,
+        "narHash": "sha256-tbWug3uXPlSm1j0xD80Y3xbP+otT6gLnQo1e/vQat48=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "41b3b080cc3e4b3a48e933b87fc15a05f1870779",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "stable": {
+      "locked": {
+        "lastModified": 1714971268,
+        "narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-23.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "systems": {
      "locked": {
        "lastModified": 1689347949,
@ -701,6 +862,21 @@
        "type": "github"
      }
    },
+    "systems_6": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
    "treefmt-nix": {
      "inputs": {
        "nixpkgs": [
@ -777,8 +953,8 @@
    },
    "zig-overlay": {
      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_5",
+        "flake-compat": "flake-compat_3",
+        "flake-utils": "flake-utils_6",
        "nixpkgs": [
          "zls",
          "nixpkgs"
@ -800,7 +976,7 @@
    },
    "zig2nix": {
      "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_4",
        "nixpkgs": [
          "nixpkgs"
        ]
@ -821,7 +997,7 @@
    },
    "zls": {
      "inputs": {
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_5",
        "gitignore": "gitignore",
        "langref": "langref",
        "nixpkgs": [
--- a/flake.nix
+++ b/flake.nix
@ -12,7 +12,7 @@
    lix-module.inputs.nixpkgs.follows = "nixpkgs";

    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    # stable.url = "github:nixos/nixpkgs/nixos-23.11";
+    stable.url = "github:nixos/nixpkgs/nixos-23.11";

    tsm.url = "github:daylinmorgan/tsm?dir=nix";
    tsm.inputs.nixpkgs.follows = "nixpkgs";
@ -23,6 +23,9 @@
    hyprland-contrib.url = "github:hyprwm/contrib";
    nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";

+    pinix.url = "github:remi-dupre/pinix";
+    pinix.inputs.nixpkgs.follows = "nixpkgs";
+
    nix-index-database.url = "github:nix-community/nix-index-database";
    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";

@ -33,6 +36,7 @@
    zls.inputs.nixpkgs.follows = "nixpkgs";

    f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake";
+    roc.url = "github:roc-lang/roc";
  };

  nixConfig = {
@ -41,12 +45,14 @@
      "https://nixpkgs-wayland.cachix.org"
      "https://daylin.cachix.org"
      "https://cache.lix.systems"
+      #   "https://cache.garnix.io"
    ];
    extra-trusted-public-keys = [
      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
      "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
      "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
      "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
+      #   "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
    ];
  };
 }
--- a/hosts/othalan/default.nix
+++ b/hosts/othalan/default.nix
@ -1,5 +1,19 @@
-{ pkgs, enabled, ... }:
 {
+  inputs,
+  pkgs,
+  enabled,
+  ...
+}:
+{
+  inputs,
+  pkgs,
+  enabled,
+  ...
+}:
+let
+roc = inputs.roc.packages.${pkgs.system}.default
+
+in {
  oizys = {
    desktop = enabled;
    hyprland = enabled;
@ -22,6 +36,7 @@
  environment.systemPackages = with pkgs; [
    zk
    quarto
+    inpurs.roc.packages.${pkgs.system}.default
  ];

  services.restic.backups.gdrive = {
--- a/modules/nix.nix
+++ b/modules/nix.nix
@ -24,6 +24,7 @@
    pkgs.nixd
    pkgs.nixfmt-rfc-style
    self.packages.${pkgs.system}.default
+    inputs.pinix.packages.${pkgs.system}.default
  ];

  programs.nix-index-database.comma.enable = true;
@ -34,5 +35,12 @@
  nix.settings = {
    trusted-users = [ "@wheel" ];
    accept-flake-config = true;
+
+    # substituters = [
+    #   "https://daylin.cachix.org"
+    # ];
+    # trusted-public-keys = [
+    #   "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
+    # ];
  };
 }
--- a/modules/runes/default.nix
+++ b/modules/runes/default.nix
@ -65,7 +65,6 @@ in
        number = "2"; # todo: autogenerate based on hostname?
        name = cfg.name;
      };
-
    })
  ];
 }
Author	SHA1	Message	Date
Daylin Morgan	2ffdd71d71	try out lix for fun and profit	2024-05-10 09:33:35 -05:00
Daylin Morgan	111b631013	try out roc	2024-05-10 09:33:35 -05:00