From 1212e6acf8dccf46090e1c2f4b9e8850c5b984d1 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Thu, 1 Feb 2024 16:25:20 -0600 Subject: [PATCH] chore: update input urls Signed-off-by: jolheiser --- apps/nogui/default.nix | 1 - flake.lock | 77 +++++++++++++++--------------------------- flake.nix | 22 +++++------- justfile | 2 -- 4 files changed, 36 insertions(+), 66 deletions(-) diff --git a/apps/nogui/default.nix b/apps/nogui/default.nix index 5f70234..8ba4cd9 100644 --- a/apps/nogui/default.nix +++ b/apps/nogui/default.nix @@ -48,7 +48,6 @@ tclip templ jolheiser.helix - jolheiser.nixpl jolheiser.tmpl jolheiser.gomodinit ]; diff --git a/flake.lock b/flake.lock index 2984e28..a667262 100644 --- a/flake.lock +++ b/flake.lock @@ -78,17 +78,17 @@ ] }, "locked": { - "lastModified": 1701147025, - "narHash": "sha256-abZqC0H3QV6OXeKHN7+mUNVmjRDxgPRMphGDppQuPaI=", + "lastModified": 1702606669, + "narHash": "sha256-98XV0l+3b4sFhxdepNoanqDzhgnEen5ZcrGtqoRp4cA=", "ref": "refs/heads/main", - "rev": "993b3ff8bfc055dd70126f290409e6b7134babd8", - "revCount": 2, + "rev": "f393c786b0ad826866d7e30d1abbd3bea319cb34", + "revCount": 3, "type": "git", - "url": "https://git.jojodev.com/jolheiser/gist" + "url": "https://git.jolheiser.com/gist.git" }, "original": { "type": "git", - "url": "https://git.jojodev.com/jolheiser/gist" + "url": "https://git.jolheiser.com/gist.git" } }, "git-age": { @@ -107,11 +107,11 @@ "rev": "72352f984f8c4b2291bcb2c08b7b6dc718619a38", "revCount": 9, "type": "git", - "url": "https://git.jojodev.com/jolheiser/git-age" + "url": "https://git.jolheiser.com/git-age.git" }, "original": { "type": "git", - "url": "https://git.jojodev.com/jolheiser/git-age" + "url": "https://git.jolheiser.com/git-age.git" } }, "gitignore": { @@ -196,11 +196,11 @@ "rev": "6686d6491326ec79522d262ea150602d6bcb6c7a", "revCount": 5, "type": "git", - "url": "https://git.jojodev.com/jolheiser/gomodinit" + "url": "https://git.jolheiser.com/gomodinit.git" }, "original": { "type": "git", - "url": "https://git.jojodev.com/jolheiser/gomodinit" + "url": "https://git.jolheiser.com/gomodinit.git" } }, "helix": { @@ -216,11 +216,11 @@ "rev": "20a5d8a2ee8a8f5b6a8d0212a2eb5c9fb623750c", "revCount": 12, "type": "git", - "url": "https://git.jojodev.com/jolheiser/helix.drv" + "url": "https://git.jolheiser.com/helix.drv.git" }, "original": { "type": "git", - "url": "https://git.jojodev.com/jolheiser/helix.drv" + "url": "https://git.jolheiser.com/helix.drv.git" } }, "home-manager": { @@ -256,11 +256,11 @@ "rev": "a68a81cbc743e84aaee331ae7e58699398dd732d", "revCount": 167, "type": "git", - "url": "https://git.jojodev.com/jolheiser/nur" + "url": "https://git.jolheiser.com/nur.git" }, "original": { "type": "git", - "url": "https://git.jojodev.com/jolheiser/nur" + "url": "https://git.jolheiser.com/nur.git" } }, "nixpkgs": { @@ -295,26 +295,6 @@ "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, @@ -340,17 +320,17 @@ ] }, "locked": { - "lastModified": 1697473034, - "narHash": "sha256-hIee7tDD9B1LRNUE7Cy11M1yrbbHHa6pnUZes3CGKxg=", + "lastModified": 1697400727, + "narHash": "sha256-J60py/GplHyhMQ0ZcxHfaQwY9SSQVkpGd6rtYDYHbh4=", "ref": "refs/heads/main", - "rev": "94593c9097917604f006a4dcd5e7b10a1b42beb1", - "revCount": 6, + "rev": "993470d86dcdb947094ee672fe66b2e0a1d37d1a", + "revCount": 5, "type": "git", - "url": "https://git.jojodev.com/jolheiser/resume" + "url": "https://git.jolheiser.com/resume.git" }, "original": { "type": "git", - "url": "https://git.jojodev.com/jolheiser/resume" + "url": "https://git.jolheiser.com/resume.git" } }, "root": { @@ -366,7 +346,6 @@ "jolheiser-nur": "jolheiser-nur", "nixpkgs": "nixpkgs", "nixpkgs-py39": "nixpkgs-py39", - "nixpl": "nixpl", "nur": "nur", "resume": "resume", "tclip": "tclip", @@ -535,11 +514,11 @@ "rev": "4281434739728fcc2cdc0f9068985d5b29ac4e70", "revCount": 35, "type": "git", - "url": "https://git.jojodev.com/jolheiser/tmpl" + "url": "https://git.jolheiser.com/tmpl.git" }, "original": { "type": "git", - "url": "https://git.jojodev.com/jolheiser/tmpl" + "url": "https://git.jolheiser.com/tmpl.git" } }, "ugit": { @@ -551,11 +530,11 @@ "tailwind-ctp-lsp": "tailwind-ctp-lsp" }, "locked": { - "lastModified": 1705799434, - "narHash": "sha256-IbYF9toWG4BK6CKELz6s+ony7sLnaAv95DAal3jaHEw=", + "lastModified": 1706825165, + "narHash": "sha256-T6WxCXZcPsKkNTRhquiJjh6Nij8OKb93/1xEJVrHZLs=", "ref": "refs/heads/main", - "rev": "b039da654c21994ef23b218c635e0dc17494f3ae", - "revCount": 14, + "rev": "bc205b0b38a21fe349310d7ec6742dc18a4215a1", + "revCount": 17, "type": "git", "url": "https://git.jolheiser.com/ugit.git" }, @@ -585,11 +564,11 @@ "rev": "695d1f16e4345549afd2fdb8ee51953cb804b2eb", "revCount": 13, "type": "git", - "url": "https://git.jolheiser.com/jolheiserdotcom.git" + "url": "https://git.jolheiser.com/jolheiser.com.git" }, "original": { "type": "git", - "url": "https://git.jolheiser.com/jolheiserdotcom.git" + "url": "https://git.jolheiser.com/jolheiser.com.git" } }, "wsl": { diff --git a/flake.nix b/flake.nix index 729e553..b17e49b 100644 --- a/flake.nix +++ b/flake.nix @@ -21,15 +21,15 @@ nur.url = "github:nix-community/NUR"; jolheiser-nur = { - url = "git+https://git.jojodev.com/jolheiser/nur"; + url = "git+https://git.jolheiser.com/nur.git"; inputs.nixpkgs.follows = "nixpkgs"; }; helix = { - url = "git+https://git.jojodev.com/jolheiser/helix.drv"; + url = "git+https://git.jolheiser.com/helix.drv.git"; inputs.nixpkgs.follows = "nixpkgs"; }; website = { - url = "git+https://git.jolheiser.com/jolheiserdotcom.git"; + url = "git+https://git.jolheiser.com/jolheiser.com.git"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils"; @@ -37,38 +37,33 @@ }; }; resume = { - url = "git+https://git.jojodev.com/jolheiser/resume"; + url = "git+https://git.jolheiser.com/resume.git"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils"; }; }; git-age = { - url = "git+https://git.jojodev.com/jolheiser/git-age"; + url = "git+https://git.jolheiser.com/git-age.git"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils"; }; }; gist = { - url = "git+https://git.jojodev.com/jolheiser/gist"; + url = "git+https://git.jolheiser.com/gist.git"; 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"; + url = "git+https://git.jolheiser.com/tmpl.git"; inputs.nixpkgs.follows = "nixpkgs"; }; gomodinit = { - url = "git+https://git.jojodev.com/jolheiser/gomodinit"; + url = "git+https://git.jolheiser.com/gomodinit.git"; inputs.nixpkgs.follows = "nixpkgs"; }; ugit = { url = "git+https://git.jolheiser.com/ugit.git"; - #url = "git+https://git.jojodev.com/jolheiser/ugit.git"; inputs.nixpkgs.follows = "nixpkgs"; }; # Other flakes @@ -120,7 +115,6 @@ 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; diff --git a/justfile b/justfile index 15037f1..0cfb085 100644 --- a/justfile +++ b/justfile @@ -4,10 +4,8 @@ default: [private] rebuild *args: - @touch .dirty @git add . @sudo nixos-rebuild --flake . {{args}} - @git rm -f .dirty # Rebuild the current machine switch *args: