diff --git a/flake.lock b/flake.lock index 1b78fe3..5e6e268 100644 --- a/flake.lock +++ b/flake.lock @@ -1417,16 +1417,16 @@ }, "nixpkgs_19": { "locked": { - "lastModified": 1774386573, - "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", + "lastModified": 1740547748, + "narHash": "sha256-Ly2fBL1LscV+KyCqPRufUBuiw+zmWrlJzpWOWbahplg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", + "rev": "3a05eebede89661660945da1f151959900903b6a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -1447,6 +1447,22 @@ "type": "github" } }, + "nixpkgs_20": { + "locked": { + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_3": { "locked": { "lastModified": 1782918843, @@ -1799,6 +1815,7 @@ "sops-nix": "sops-nix", "tnvim": "tnvim", "treefmt-nix": "treefmt-nix_2", + "trok": "trok", "tshell": "tshell", "vicinae-extensions": "vicinae-extensions", "voxtype": "voxtype", @@ -2168,6 +2185,24 @@ "type": "github" } }, + "trok": { + "inputs": { + "nixpkgs": "nixpkgs_19" + }, + "locked": { + "lastModified": 1788792599, + "narHash": "sha256-BBW8R8SJhJGym0nX/q2MTfmKuPdFUOg/jAqmUQjb+1M=", + "owner": "tuxdotrs", + "repo": "trok", + "rev": "a616409ee03c1d50c8fd6d3a24ff1eea52c13f96", + "type": "github" + }, + "original": { + "owner": "tuxdotrs", + "repo": "trok", + "type": "github" + } + }, "tshell": { "inputs": { "nixpkgs": [ @@ -2284,7 +2319,7 @@ "voxtype": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_19" + "nixpkgs": "nixpkgs_20" }, "locked": { "lastModified": 1780004034, diff --git a/flake.nix b/flake.nix index c07f37a..4b99de0 100644 --- a/flake.nix +++ b/flake.nix @@ -84,5 +84,6 @@ voxtype.url = "github:peteonrails/voxtype/v0.7.5"; opencode.url = "github:anomalyco/opencode"; serpantinum.url = "github:ilyamiro/serpantinum"; + trok.url = "github:tuxdotrs/trok"; }; } diff --git a/modules/flake/overlays.nix b/modules/flake/overlays.nix index 9dc6bf5..77579aa 100644 --- a/modules/flake/overlays.nix +++ b/modules/flake/overlays.nix @@ -7,6 +7,7 @@ modifications = final: prev: { tnvim = inputs.tnvim.packages.${prev.stdenv.hostPlatform.system}.default; tshell = inputs.tshell.packages.${prev.stdenv.hostPlatform.system}.default; + trok = inputs.trok.packages.${prev.stdenv.hostPlatform.system}.default; cyber-tux = inputs.cyber-tux.packages.${prev.stdenv.hostPlatform.system}.default; wezterm-git = inputs.wezterm-flake.packages.${prev.stdenv.hostPlatform.system}.default; hyprland-git = inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}; diff --git a/modules/hm/shell/misc.nix b/modules/hm/shell/misc.nix index acb56ee..ca35bf1 100644 --- a/modules/hm/shell/misc.nix +++ b/modules/hm/shell/misc.nix @@ -11,6 +11,7 @@ jq dig lsof + trok ]; }; } diff --git a/modules/hosts/alpha/config.nix b/modules/hosts/alpha/config.nix index 1c31ffe..1e33eaf 100644 --- a/modules/hosts/alpha/config.nix +++ b/modules/hosts/alpha/config.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ inputs, config, ... }: { flake.modules.nixos.alpha = { @@ -7,12 +7,17 @@ ... }@innerArgs: { - imports = with config.flake.modules.nixos; [ - boot - networking - virtualisation - services - ]; + imports = + with config.flake.modules.nixos; + [ + boot + networking + virtualisation + services + ] + ++ [ + inputs.trok.nixosModules.default + ]; tnix = { boot = { @@ -55,6 +60,10 @@ enable = true; environmentFile = innerArgs.config.sops.secrets."mediaflow-proxy".path; }; + + trok = { + enable = true; + }; }; virtualisation = { diff --git a/modules/nixos/services/trok.nix b/modules/nixos/services/trok.nix new file mode 100644 index 0000000..7c0a732 --- /dev/null +++ b/modules/nixos/services/trok.nix @@ -0,0 +1,27 @@ +{ inputs, ... }: { + flake.modules.nixos.services = + { + config, + lib, + ... + }: + with lib; + let + cfg = config.tnix.services.trok; + in + { + imports = [ + inputs.trok.nixosModules.default + ]; + + options.tnix.services.trok = { + enable = mkEnableOption "trok"; + }; + + config = mkIf cfg.enable { + services.trok = { + enable = true; + }; + }; + }; +}