diff --git a/flake.lock b/flake.lock index bd749b3..4b440c7 100755 --- a/flake.lock +++ b/flake.lock @@ -21,6 +21,40 @@ "type": "github" } }, + "ameba-src": { + "flake": false, + "locked": { + "lastModified": 1668496515, + "narHash": "sha256-SZ2sBQeZgtPOYioH9eK5MveFtWVGPvgKMrqsCfjoRGM=", + "owner": "crystal-ameba", + "repo": "ameba", + "rev": "cc687d028180203cb53390484871ffb8669b88c8", + "type": "github" + }, + "original": { + "owner": "crystal-ameba", + "ref": "v1.3.1", + "repo": "ameba", + "type": "github" + } + }, + "bdwgc-src": { + "flake": false, + "locked": { + "lastModified": 1661523039, + "narHash": "sha256-UYJQGeSykmfydGAmTlNJNyAPBasBkddOSoopBHiY7TI=", + "owner": "ivmai", + "repo": "bdwgc", + "rev": "cd1fbc1dbfd2cc888436944dd2784f39820698d7", + "type": "github" + }, + "original": { + "owner": "ivmai", + "ref": "v8.2.2", + "repo": "bdwgc", + "type": "github" + } + }, "cohost-blogger": { "inputs": { "flake-utils": "flake-utils", @@ -42,6 +76,137 @@ "url": "https://git.oat.zone/oat/cohost-blogger" } }, + "crystal-aarch64-darwin": { + "flake": false, + "locked": { + "narHash": "sha256-d5znjl8QaQ/dMNa4GtKS/K14PwjBgt8Md6AwSCKcyl4=", + "type": "tarball", + "url": "https://github.com/crystal-lang/crystal/releases/download/1.6.1/crystal-1.6.1-1-darwin-universal.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/crystal-lang/crystal/releases/download/1.6.1/crystal-1.6.1-1-darwin-universal.tar.gz" + } + }, + "crystal-flake": { + "inputs": { + "ameba-src": "ameba-src", + "bdwgc-src": "bdwgc-src", + "crystal-aarch64-darwin": "crystal-aarch64-darwin", + "crystal-i686-linux": "crystal-i686-linux", + "crystal-src": "crystal-src", + "crystal-x86_64-darwin": "crystal-x86_64-darwin", + "crystal-x86_64-linux": "crystal-x86_64-linux", + "crystalline-src": "crystalline-src", + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1672548746, + "narHash": "sha256-CUpInKhwsX/jQvqeyGPC7mHQV6VWjaCOEwE+fh1uPwI=", + "owner": "manveru", + "repo": "crystal-flake", + "rev": "322876b36ae530b7648eb2692b9fa2c0f4e068b7", + "type": "github" + }, + "original": { + "owner": "manveru", + "repo": "crystal-flake", + "type": "github" + } + }, + "crystal-gauntlet": { + "inputs": { + "crystal-flake": "crystal-flake", + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1684822231, + "narHash": "sha256-y3T+aRjag9UigZ02yIS6D3ymRhOKgHwr8E74qbRYJbQ=", + "ref": "refs/heads/main", + "rev": "d2e051b09dd5ecc888a09da2b2fab33750a2e078", + "revCount": 196, + "type": "git", + "url": "https://git.oat.zone/oat/crystal-gauntlet" + }, + "original": { + "type": "git", + "url": "https://git.oat.zone/oat/crystal-gauntlet" + } + }, + "crystal-i686-linux": { + "flake": false, + "locked": { + "narHash": "sha256-Hfs70OcJYh+HlGQEftthr1qj10yRCAjzlsqnlUrLdjg=", + "type": "tarball", + "url": "https://github.com/crystal-lang/crystal/releases/download/1.6.2/crystal-1.6.2-1-linux-x86_64.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/crystal-lang/crystal/releases/download/1.6.2/crystal-1.6.2-1-linux-x86_64.tar.gz" + } + }, + "crystal-src": { + "flake": false, + "locked": { + "lastModified": 1667495929, + "narHash": "sha256-WgU6Y8ww1IYyB0vd5tXwmWBEL5RiPjHA7YzPd21jlsY=", + "owner": "crystal-lang", + "repo": "crystal", + "rev": "879691b2e3268ab290a2a0951bd1d6032f0d90f3", + "type": "github" + }, + "original": { + "owner": "crystal-lang", + "ref": "1.6.2", + "repo": "crystal", + "type": "github" + } + }, + "crystal-x86_64-darwin": { + "flake": false, + "locked": { + "narHash": "sha256-Hfs70OcJYh+HlGQEftthr1qj10yRCAjzlsqnlUrLdjg=", + "type": "tarball", + "url": "https://github.com/crystal-lang/crystal/releases/download/1.6.2/crystal-1.6.2-1-linux-x86_64.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/crystal-lang/crystal/releases/download/1.6.2/crystal-1.6.2-1-linux-x86_64.tar.gz" + } + }, + "crystal-x86_64-linux": { + "flake": false, + "locked": { + "narHash": "sha256-Hfs70OcJYh+HlGQEftthr1qj10yRCAjzlsqnlUrLdjg=", + "type": "tarball", + "url": "https://github.com/crystal-lang/crystal/releases/download/1.6.2/crystal-1.6.2-1-linux-x86_64.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/crystal-lang/crystal/releases/download/1.6.2/crystal-1.6.2-1-linux-x86_64.tar.gz" + } + }, + "crystalline-src": { + "flake": false, + "locked": { + "lastModified": 1665222943, + "narHash": "sha256-j/rQf+qn5ZjZhq3wG4WEKzG3YwRcnUEb4y36qXpiW7Q=", + "owner": "elbywan", + "repo": "crystalline", + "rev": "41665a798659459ecd6e2cb1169d7faf1783e746", + "type": "github" + }, + "original": { + "owner": "elbywan", + "ref": "v0.7.0", + "repo": "crystalline", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -66,7 +231,7 @@ }, "emacs-overlay": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] @@ -85,6 +250,24 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1672152762, + "narHash": "sha256-U8iWWHgabN07zfbgedogMVWrEP1Zywyf3Yx3OYHSSgE=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "19e0f88324d90509141e192664ded98bb88ef9b2", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -119,6 +302,21 @@ } }, "flake-utils_3": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -240,7 +438,7 @@ }, "nix-minecraft": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] @@ -276,17 +474,36 @@ }, "nixpkgs": { "locked": { - "lastModified": 1679172431, - "narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=", + "lastModified": 1658406394, + "narHash": "sha256-hgibXbbmxucpVJy9eOXKn7HxQtVkpeZ8euSnWl6c9Mk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1603d11595a232205f03d46e635d919d1e1ec5b9", + "rev": "c93e5ab157b45adbb6165bd85a9d8f67e49ff31d", "type": "github" }, "original": { - "id": "nixpkgs", + "owner": "NixOS", + "ref": "nixos-22.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1671359686, + "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", "ref": "nixos-unstable", - "type": "indirect" + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-unstable": { @@ -305,6 +522,21 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1679172431, + "narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1603d11595a232205f03d46e635d919d1e1ec5b9", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1672441588, "narHash": "sha256-jx5kxOyeObnVD44HRebKYL3cjWrcKhhcDmEYm0/naDY=", @@ -322,6 +554,7 @@ "inputs": { "agenix": "agenix", "cohost-blogger": "cohost-blogger", + "crystal-gauntlet": "crystal-gauntlet", "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "hyprland": "hyprland", @@ -329,7 +562,7 @@ "hyprpicker": "hyprpicker", "nix-minecraft": "nix-minecraft", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "vscode-server": "vscode-server" } @@ -351,7 +584,7 @@ }, "vscode-server": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1676501444, diff --git a/flake.nix b/flake.nix index 6345f01..2803f01 100755 --- a/flake.nix +++ b/flake.nix @@ -29,6 +29,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + crystal-gauntlet = { + url = "git+https://git.oat.zone/oat/crystal-gauntlet"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + cohost-blogger = { url = "git+https://git.oat.zone/oat/cohost-blogger"; inputs.nixpkgs.follows = "nixpkgs"; @@ -57,7 +62,7 @@ vscode-server.url = "github:msteen/nixos-vscode-server"; }; - outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, vscode-server, nix-minecraft, cohost-blogger, /* hyprland, hyprpaper, hyprpicker, */ ... }: + outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, vscode-server, nix-minecraft, /* hyprland, hyprpaper, hyprpicker, */ ... }: let system = "x86_64-linux"; diff --git a/hosts/lucent-firepit/default.nix b/hosts/lucent-firepit/default.nix index 237df24..d4b5602 100644 --- a/hosts/lucent-firepit/default.nix +++ b/hosts/lucent-firepit/default.nix @@ -17,6 +17,7 @@ in { #inputs.watch-party.nixosModules.watch-party (fetchTarball "https://github.com/msteen/nixos-vscode-server/tarball/master") inputs.cohost-blogger.nixosModules.cohost-blogger + inputs.crystal-gauntlet.nixosModules.crystal-gauntlet ]; # services.auto-fix-vscode-server.enable = true; diff --git a/hosts/lucent-firepit/webapps/default.nix b/hosts/lucent-firepit/webapps/default.nix index 07b7bf8..c2ed555 100644 --- a/hosts/lucent-firepit/webapps/default.nix +++ b/hosts/lucent-firepit/webapps/default.nix @@ -9,6 +9,12 @@ in { domain = "blog.oat.zone"; port = 3500; }; + + services.crystal-gauntlet = { + enable = true; + domain = "gdpstest.oat.zone"; + port = 1982; + }; modules = { services = {