diff --git a/apps/gui/default.nix b/apps/gui/default.nix index 129d932ed0dedbc1b4dc65d5bd7ab60862499c44..a370b445b5ec317c2c38f3bc4aadaaec835e2aa6 100644 --- a/apps/gui/default.nix +++ b/apps/gui/default.nix @@ -30,8 +30,10 @@ # IDEs 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 2a0aa1bcbe45e061e26f1167a12a456c06ec0ab5..417ee10a2cc1403e06550b386eb7112078c0398f 100644 --- a/apps/nogui/default.nix +++ b/apps/nogui/default.nix @@ -47,9 +47,6 @@ jolheiser.git-age 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 84665a38d8d9a10ce6be00bd1cef62190359d5be..843e9b7d2957f6c9860bc1b83097106a6e9251b6 100644 --- a/apps/nogui/nushell.nix +++ b/apps/nogui/nushell.nix @@ -24,7 +24,7 @@ use ${nu_scripts}/share/nu_scripts/custom-completions/just/just-completions.nu * use ${nu_scripts}/share/nu_scripts/custom-completions/nix/nix-completions.nu * use ${jolheiser.nur.kv}/share/kv-completions.nu * - use ${jolheiser.tmpl}/share/tmpl-completions.nu * + use ${jolheiser.nur.tmpl}/share/tmpl-completions.nu * ''; extraEnv = '' $env.GOPATH = "${config.xdg.dataHome}/go" diff --git a/flake.lock b/flake.lock index 50d332818486630898cfaa7ea4a55960e41eb2b4..b1a1a317f1bc27ccbd7bfb6baaef6bb5e94daab4 100644 --- a/flake.lock +++ b/flake.lock @@ -168,26 +168,6 @@ "type": "github" } }, "nixpkgs": [ - "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" - } - }, - "nixpkgs": [ "home-manager": [], "inputs": { "nixpkgs": [ @@ -281,27 +261,6 @@ "type": "github" } }, { - "darwin": [], - "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" - } - }, -{ }, "locked": { "lastModified": 1701441860, @@ -348,21 +307,16 @@ "gist": "gist", "git-age": "git-age", "golink": "golink", "lastModified": 1701216516, - "nixpkgs": [ - "lastModified": 1701216516, "nixpkgs" "home-manager": "home-manager", "jolheiser-nur": "jolheiser-nur", "nixpkgs": "nixpkgs", "nixpkgs-py36": "nixpkgs-py36", "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=", - "agenix": { - "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=", "inputs": { "resume": "resume", "tclip": "tclip", "templ": "templ", - "tmpl": "tmpl", "website": "website" } }, @@ -467,26 +421,6 @@ "original": { "owner": "a-h", "repo": "templ", "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": { diff --git a/flake.nix b/flake.nix index 7096ed01dd90a6af51e0bf082c075703ed7f0bd0..a512769f75e6edcb846cc4f2831e9709f7ff9aa6 100644 --- a/flake.nix +++ b/flake.nix @@ -54,18 +54,6 @@ gist = { 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"; @@ -97,9 +85,6 @@ website, resume, git-age, gist, - tmpl, - nixpl, - gomodinit, nixpkgs-py36, golink, tclip, @@ -119,9 +104,6 @@ website = inputs.website.packages.${prev.system}.default; 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;