diff --git a/apps/gui/default.nix b/apps/gui/default.nix index a370b44..129d932 100644 --- a/apps/gui/default.nix +++ b/apps/gui/default.nix @@ -30,10 +30,8 @@ jetbrains.goland # Flake overlays - jolheiser.nur.gomodinit jolheiser.nur.imp jolheiser.nur.kv - jolheiser.nur.tmpl ]; }; dconf.settings = { diff --git a/apps/nogui/default.nix b/apps/nogui/default.nix index 417ee10..2a0aa1b 100644 --- a/apps/nogui/default.nix +++ b/apps/nogui/default.nix @@ -47,6 +47,9 @@ tclip templ jolheiser.helix + jolheiser.nixpl + jolheiser.tmpl + jolheiser.gomodinit ]; activation.report-changes = config.lib.dag.entryAnywhere '' ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff $oldGenPath $newGenPath diff --git a/apps/nogui/nushell.nix b/apps/nogui/nushell.nix index 843e9b7..84665a3 100644 --- a/apps/nogui/nushell.nix +++ b/apps/nogui/nushell.nix @@ -24,7 +24,7 @@ use ${nu_scripts}/share/nu_scripts/custom-completions/nix/nix-completions.nu * use ${jolheiser.nur.kv}/share/kv-completions.nu * - use ${jolheiser.nur.tmpl}/share/tmpl-completions.nu * + use ${jolheiser.tmpl}/share/tmpl-completions.nu * ''; extraEnv = '' $env.GOPATH = "${config.xdg.dataHome}/go" diff --git a/flake.lock b/flake.lock index b1a1a31..50d3328 100644 --- a/flake.lock +++ b/flake.lock @@ -167,6 +167,26 @@ "type": "github" } }, + "gomodinit": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703207093, + "narHash": "sha256-rP9yqEogOJvro4GLysAOx7jgWL4TU0mydRCgK13spkw=", + "ref": "refs/heads/main", + "rev": "6686d6491326ec79522d262ea150602d6bcb6c7a", + "revCount": 5, + "type": "git", + "url": "https://git.jojodev.com/jolheiser/gomodinit" + }, + "original": { + "type": "git", + "url": "https://git.jojodev.com/jolheiser/gomodinit" + } + }, "helix": { "inputs": { "nixpkgs": [ @@ -259,6 +279,26 @@ "type": "github" } }, + "nixpl": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703195882, + "narHash": "sha256-2G3AycxaKv7IFggZPYel2TedIKznNKWzybEZ+1Td02c=", + "ref": "refs/heads/main", + "rev": "578a6c9e163b20bb6af6186fa0a5e3baf45789c2", + "revCount": 2, + "type": "git", + "url": "https://git.jojodev.com/jolheiser/nixpl" + }, + "original": { + "type": "git", + "url": "https://git.jojodev.com/jolheiser/nixpl" + } + }, "nur": { "locked": { "lastModified": 1701441860, @@ -304,15 +344,18 @@ "gist": "gist", "git-age": "git-age", "golink": "golink", + "gomodinit": "gomodinit", "helix": "helix", "home-manager": "home-manager", "jolheiser-nur": "jolheiser-nur", "nixpkgs": "nixpkgs", "nixpkgs-py36": "nixpkgs-py36", + "nixpl": "nixpl", "nur": "nur", "resume": "resume", "tclip": "tclip", "templ": "templ", + "tmpl": "tmpl", "website": "website" } }, @@ -419,6 +462,26 @@ "type": "github" } }, + "tmpl": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703045685, + "narHash": "sha256-yiUMTdqR6DFfLdJ0aqJnQ94Z9PF2LI/Tim1N/U7GgJo=", + "ref": "refs/heads/main", + "rev": "01944e1a3ace27f1a292c606ac11f3db31e3352e", + "revCount": 34, + "type": "git", + "url": "https://git.jojodev.com/jolheiser/tmpl" + }, + "original": { + "type": "git", + "url": "https://git.jojodev.com/jolheiser/tmpl" + } + }, "website": { "inputs": { "flake-utils": [ diff --git a/flake.nix b/flake.nix index a512769..7096ed0 100644 --- a/flake.nix +++ b/flake.nix @@ -54,6 +54,18 @@ url = "git+https://git.jojodev.com/jolheiser/gist"; inputs.nixpkgs.follows = "nixpkgs"; }; + tmpl = { + url = "git+https://git.jojodev.com/jolheiser/tmpl"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixpl = { + url = "git+https://git.jojodev.com/jolheiser/nixpl"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + gomodinit = { + url = "git+https://git.jojodev.com/jolheiser/gomodinit"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Other flakes golink = { url = "github:tailscale/golink"; @@ -85,6 +97,9 @@ resume, git-age, gist, + tmpl, + nixpl, + gomodinit, nixpkgs-py36, golink, tclip, @@ -104,6 +119,9 @@ resume = inputs.resume.packages.${prev.system}.default; git-age = inputs.git-age.packages.${prev.system}.default; gist = inputs.gist.packages.${prev.system}.default; + tmpl = inputs.tmpl.packages.${prev.system}.default; + nixpl = inputs.nixpl.packages.${prev.system}.default; + gomodinit = inputs.gomodinit.packages.${prev.system}.default; }; tclip = inputs.tclip.packages.${prev.system}.tclip; templ = inputs.templ.packages.${prev.system}.templ;