diff --git a/flake.lock b/flake.lock index 062cfc5..f8a0ba3 100644 --- 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, @@ -93,6 +109,24 @@ "inputs": { "systems": "systems_3" }, + "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_3": { + "inputs": { + "systems": "systems_4" + }, "locked": { "lastModified": 1705309234, "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", @@ -107,9 +141,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -125,7 +159,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -404,6 +438,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, @@ -536,6 +595,22 @@ "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": [ @@ -556,6 +631,28 @@ "type": "github" } }, + "roc": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", + "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", @@ -565,12 +662,38 @@ "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, @@ -647,6 +770,21 @@ "type": "github" } }, + "systems_5": { + "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": [ @@ -723,8 +861,8 @@ }, "zig-overlay": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_4", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_5", "nixpkgs": [ "zls", "nixpkgs" @@ -746,7 +884,7 @@ }, "zig2nix": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] @@ -767,7 +905,7 @@ }, "zls": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "gitignore": "gitignore", "langref": "langref", "nixpkgs": [ diff --git a/flake.nix b/flake.nix index d13b9f3..18a5c25 100644 --- a/flake.nix +++ b/flake.nix @@ -29,6 +29,7 @@ zls.inputs.nixpkgs.follows = "nixpkgs"; f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake"; + roc.url = "github:roc-lang/roc"; }; nixConfig = { diff --git a/hosts/othalan/default.nix b/hosts/othalan/default.nix index 64ced9f..5a36b58 100644 --- 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 = { diff --git a/modules/runes/default.nix b/modules/runes/default.nix index 4e6ede6..ca129ed 100644 --- 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; }; - }) ]; }