Our josh files and combined project pieces have been a mess for a while. As I'm creating a new project, I thought it was high time to tidy them up so they pull out the right files and we can share things like our inputs.
+43
-222
Diff
round #4
packetmix/npins/default.nix
npins/default.nix
packetmix/npins/default.nix
npins/default.nix
packetmix/npins/default.nix.license
npins/default.nix.license
packetmix/npins/default.nix.license
npins/default.nix.license
+30
packetmix/npins/sources.json
npins/sources.json
+30
packetmix/npins/sources.json
npins/sources.json
···
280
280
"url": "https://api.github.com/repos/9001/copyparty/tarball/refs/tags/v1.19.20",
281
281
"hash": "sha256-/Wm8hZvdGfYWdTOF+dgTPX8DGuSKLhGw4qC4crf1dAo="
282
282
},
283
+
"fenix": {
284
+
"type": "Git",
285
+
"repository": {
286
+
"type": "GitHub",
287
+
"owner": "nix-community",
288
+
"repo": "fenix"
289
+
},
290
+
"branch": "monthly",
291
+
"submodules": false,
292
+
"revision": "f44d7c3596ff028ad9f7fcc31d1941ed585f11b3",
293
+
"url": "https://github.com/nix-community/fenix/archive/f44d7c3596ff028ad9f7fcc31d1941ed585f11b3.tar.gz",
294
+
"hash": "sha256-6RzWfxENGlO73jQb3uQNgOvubUFwvveeIg+PZxhAu6s="
295
+
},
283
296
"headscale": {
284
297
"type": "Git",
285
298
"repository": {
···
521
534
"url": "https://github.com/andir/npins/archive/0d6aaa4b3dcd1d8badbed2b66e0c50867330a86e.tar.gz",
522
535
"hash": "sha256-9N14/tliOiA49Us2uFUWHcrhYN8AmJjR+bnwzcxejgs="
523
536
},
537
+
"quickshell": {
538
+
"type": "GitRelease",
539
+
"repository": {
540
+
"type": "Forgejo",
541
+
"server": "https://git.outfoxxed.me/",
542
+
"owner": "quickshell",
543
+
"repo": "quickshell"
544
+
},
545
+
"pre_releases": false,
546
+
"version_upper_bound": null,
547
+
"release_prefix": null,
548
+
"submodules": false,
549
+
"version": "v0.2.0",
550
+
"revision": "a5431dd02dc23d9ef1680e67777fed00fe5f7cda",
551
+
"url": "https://git.outfoxxed.me/api/v1/repos/quickshell/quickshell/archive/v0.2.0.tar.gz",
552
+
"hash": "sha256-vqkSDvh7hWhPvNjMjEDV4KbSCv2jyl2Arh73ZXe274k="
553
+
},
524
554
"scriptfs": {
525
555
"type": "Git",
526
556
"repository": {
packetmix/npins/sources.json.license
npins/sources.json.license
packetmix/npins/sources.json.license
npins/sources.json.license
+1
-2
packetmix/inputs.nix
+1
-2
packetmix/inputs.nix
+4
-2
packetmix/nilla.nix
+4
-2
packetmix/nilla.nix
···
3
3
# SPDX-License-Identifier: MIT
4
4
5
5
let
6
-
pins = import ./npins;
6
+
cwd = ./.;
7
+
pins =
8
+
if builtins.hasAttr "npins" (builtins.readDir cwd) then import "${cwd}/npins" else import ../npins;
7
9
8
10
nilla = import pins.nilla;
9
11
in
···
12
14
{
13
15
includes = [
14
16
./homes
15
-
./inputs.nix
17
+
(import ./inputs.nix { inherit pins; })
16
18
./lib
17
19
./modules
18
20
./packages
+1
-4
packetmix/packages/vs-launcher/default.nix
+1
-4
packetmix/packages/vs-launcher/default.nix
···
1
1
# SPDX-FileCopyrightText: 2025 FreshlyBakedCake
2
2
#
3
3
# SPDX-License-Identifier: MIT
4
-
let
5
-
pins = import ../../npins;
6
-
in
7
4
{ config, ... }:
8
5
{
9
6
config.packages.vs-launcher = {
···
15
12
in
16
13
{ appimageTools, fetchurl }:
17
14
let
18
-
version = pins.vs-launcher.version;
15
+
version = config.inputs.vs-launcher.src.version;
19
16
pname = "vs-launcher";
20
17
src = fetchurl {
21
18
url = "https://github.com/XurxoMF/vs-launcher/releases/download/${version}/vs-launcher-${version}.AppImage";
+2
-1
projects/packetmix/workspace.josh
+2
-1
projects/packetmix/workspace.josh
+2
-1
projects/sprinkles/workspace.josh
+2
-1
projects/sprinkles/workspace.josh
+3
-1
sprinkles/nilla.nix
+3
-1
sprinkles/nilla.nix
-146
sprinkles/npins/default.nix
-146
sprinkles/npins/default.nix
···
1
-
/*
2
-
This file is provided under the MIT licence:
3
-
4
-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
5
-
6
-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
7
-
8
-
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
9
-
*/
10
-
# Generated by npins. Do not modify; will be overwritten regularly
11
-
let
12
-
data = builtins.fromJSON (builtins.readFile ./sources.json);
13
-
version = data.version;
14
-
15
-
# https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295
16
-
range =
17
-
first: last: if first > last then [ ] else builtins.genList (n: first + n) (last - first + 1);
18
-
19
-
# https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257
20
-
stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1));
21
-
22
-
# https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269
23
-
stringAsChars = f: s: concatStrings (map f (stringToCharacters s));
24
-
concatMapStrings = f: list: concatStrings (map f list);
25
-
concatStrings = builtins.concatStringsSep "";
26
-
27
-
# If the environment variable NPINS_OVERRIDE_${name} is set, then use
28
-
# the path directly as opposed to the fetched source.
29
-
# (Taken from Niv for compatibility)
30
-
mayOverride =
31
-
name: path:
32
-
let
33
-
envVarName = "NPINS_OVERRIDE_${saneName}";
34
-
saneName = stringAsChars (c: if (builtins.match "[a-zA-Z0-9]" c) == null then "_" else c) name;
35
-
ersatz = builtins.getEnv envVarName;
36
-
in
37
-
if ersatz == "" then
38
-
path
39
-
else
40
-
# this turns the string into an actual Nix path (for both absolute and
41
-
# relative paths)
42
-
builtins.trace "Overriding path of \"${name}\" with \"${ersatz}\" due to set \"${envVarName}\"" (
43
-
if builtins.substring 0 1 ersatz == "/" then
44
-
/. + ersatz
45
-
else
46
-
/. + builtins.getEnv "PWD" + "/${ersatz}"
47
-
);
48
-
49
-
mkSource =
50
-
name: spec:
51
-
assert spec ? type;
52
-
let
53
-
path =
54
-
if spec.type == "Git" then
55
-
mkGitSource spec
56
-
else if spec.type == "GitRelease" then
57
-
mkGitSource spec
58
-
else if spec.type == "PyPi" then
59
-
mkPyPiSource spec
60
-
else if spec.type == "Channel" then
61
-
mkChannelSource spec
62
-
else if spec.type == "Tarball" then
63
-
mkTarballSource spec
64
-
else
65
-
builtins.throw "Unknown source type ${spec.type}";
66
-
in
67
-
spec // { outPath = mayOverride name path; };
68
-
69
-
mkGitSource =
70
-
{
71
-
repository,
72
-
revision,
73
-
url ? null,
74
-
submodules,
75
-
hash,
76
-
branch ? null,
77
-
...
78
-
}:
79
-
assert repository ? type;
80
-
# At the moment, either it is a plain git repository (which has an url), or it is a GitHub/GitLab repository
81
-
# In the latter case, there we will always be an url to the tarball
82
-
if url != null && !submodules then
83
-
builtins.fetchTarball {
84
-
inherit url;
85
-
sha256 = hash;
86
-
}
87
-
else
88
-
let
89
-
url =
90
-
if repository.type == "Git" then
91
-
repository.url
92
-
else if repository.type == "GitHub" then
93
-
"https://github.com/${repository.owner}/${repository.repo}.git"
94
-
else if repository.type == "GitLab" then
95
-
"${repository.server}/${repository.repo_path}.git"
96
-
else
97
-
throw "Unrecognized repository type ${repository.type}";
98
-
urlToName =
99
-
url: rev:
100
-
let
101
-
matched = builtins.match "^.*/([^/]*)(\\.git)?$" url;
102
-
103
-
short = builtins.substring 0 7 rev;
104
-
105
-
appendShort = if (builtins.match "[a-f0-9]*" rev) != null then "-${short}" else "";
106
-
in
107
-
"${if matched == null then "source" else builtins.head matched}${appendShort}";
108
-
name = urlToName url revision;
109
-
in
110
-
builtins.fetchGit {
111
-
rev = revision;
112
-
narHash = hash;
113
-
114
-
inherit name submodules url;
115
-
};
116
-
117
-
mkPyPiSource =
118
-
{ url, hash, ... }:
119
-
builtins.fetchurl {
120
-
inherit url;
121
-
sha256 = hash;
122
-
};
123
-
124
-
mkChannelSource =
125
-
{ url, hash, ... }:
126
-
builtins.fetchTarball {
127
-
inherit url;
128
-
sha256 = hash;
129
-
};
130
-
131
-
mkTarballSource =
132
-
{
133
-
url,
134
-
locked_url ? url,
135
-
hash,
136
-
...
137
-
}:
138
-
builtins.fetchTarball {
139
-
url = locked_url;
140
-
sha256 = hash;
141
-
};
142
-
in
143
-
if version == 6 then
144
-
builtins.mapAttrs mkSource data.pins
145
-
else
146
-
throw "Unsupported format version ${toString version} in sources.json. Try running `npins upgrade`"
-3
sprinkles/npins/default.nix.license
-3
sprinkles/npins/default.nix.license
-59
sprinkles/npins/sources.json
-59
sprinkles/npins/sources.json
···
1
-
{
2
-
"pins": {
3
-
"fenix": {
4
-
"type": "Git",
5
-
"repository": {
6
-
"type": "GitHub",
7
-
"owner": "nix-community",
8
-
"repo": "fenix"
9
-
},
10
-
"branch": "monthly",
11
-
"submodules": false,
12
-
"revision": "f44d7c3596ff028ad9f7fcc31d1941ed585f11b3",
13
-
"url": "https://github.com/nix-community/fenix/archive/f44d7c3596ff028ad9f7fcc31d1941ed585f11b3.tar.gz",
14
-
"hash": "sha256-6RzWfxENGlO73jQb3uQNgOvubUFwvveeIg+PZxhAu6s="
15
-
},
16
-
"nilla": {
17
-
"type": "Git",
18
-
"repository": {
19
-
"type": "GitHub",
20
-
"owner": "nilla-nix",
21
-
"repo": "nilla"
22
-
},
23
-
"branch": "main",
24
-
"submodules": false,
25
-
"revision": "4e6038f4ebc89487194013af6a1e077dfeb00359",
26
-
"url": "https://github.com/nilla-nix/nilla/archive/4e6038f4ebc89487194013af6a1e077dfeb00359.tar.gz",
27
-
"hash": "sha256-7iLzbTLtgdFtm9em3xxHO9BunN2YpgYquMLKXh5hEpQ="
28
-
},
29
-
"nixpkgs": {
30
-
"type": "Git",
31
-
"repository": {
32
-
"type": "GitHub",
33
-
"owner": "nixos",
34
-
"repo": "nixpkgs"
35
-
},
36
-
"branch": "nixos-unstable",
37
-
"submodules": false,
38
-
"revision": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
39
-
"url": "https://github.com/nixos/nixpkgs/archive/a84ebe20c6bc2ecbcfb000a50776219f48d134cc.tar.gz",
40
-
"hash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ="
41
-
},
42
-
"quickshell": {
43
-
"type": "GitRelease",
44
-
"repository": {
45
-
"type": "Git",
46
-
"url": "https://git.outfoxxed.me/quickshell/quickshell.git"
47
-
},
48
-
"pre_releases": false,
49
-
"version_upper_bound": null,
50
-
"release_prefix": null,
51
-
"submodules": false,
52
-
"version": "v0.2.0",
53
-
"revision": "a5431dd02dc23d9ef1680e67777fed00fe5f7cda",
54
-
"url": null,
55
-
"hash": "sha256-vqkSDvh7hWhPvNjMjEDV4KbSCv2jyl2Arh73ZXe274k="
56
-
}
57
-
},
58
-
"version": 6
59
-
}
History
15 rounds
0 comments
freshlybakedca.ke
submitted
#14
1 commit
expand
collapse
refactor(*): add nilla/etc. in top level directory
Our josh files and combined project pieces have been a mess for a while.
As I'm creating a new project, I thought it was high time to tidy them
up so they pull out the right files and we can share things like our
inputs.
expand 0 comments
pull request successfully merged
freshlybakedca.ke
submitted
#13
1 commit
expand
collapse
refactor(*): add nilla/etc. in top level directory
Our josh files and combined project pieces have been a mess for a while.
As I'm creating a new project, I thought it was high time to tidy them
up so they pull out the right files and we can share things like our
inputs.
expand 0 comments
freshlybakedca.ke
submitted
#12
1 commit
expand
collapse
refactor(*): add nilla/etc. in top level directory
Our josh files and combined project pieces have been a mess for a while.
As I'm creating a new project, I thought it was high time to tidy them
up so they pull out the right files and we can share things like our
inputs.
expand 0 comments
freshlybakedca.ke
submitted
#11
1 commit
expand
collapse
refactor(*): add nilla/etc. in top level directory
Our josh files and combined project pieces have been a mess for a while.
As I'm creating a new project, I thought it was high time to tidy them
up so they pull out the right files and we can share things like our
inputs.
expand 0 comments
freshlybakedca.ke
submitted
#10
1 commit
expand
collapse
refactor(*): add nilla/etc. in top level directory
Our josh files and combined project pieces have been a mess for a while.
As I'm creating a new project, I thought it was high time to tidy them
up so they pull out the right files and we can share things like our
inputs.
expand 0 comments
freshlybakedca.ke
submitted
#9
1 commit
expand
collapse
refactor(*): add nilla/etc. in top level directory
Our josh files and combined project pieces have been a mess for a while.
As I'm creating a new project, I thought it was high time to tidy them
up so they pull out the right files and we can share things like our
inputs.
expand 0 comments
freshlybakedca.ke
submitted
#8
1 commit
expand
collapse
refactor(*): add nilla/etc. in top level directory
Our josh files and combined project pieces have been a mess for a while.
As I'm creating a new project, I thought it was high time to tidy them
up so they pull out the right files and we can share things like our
inputs.
expand 0 comments
freshlybakedca.ke
submitted
#7
1 commit
expand
collapse
refactor(*): add nilla/etc. in top level directory
Our josh files and combined project pieces have been a mess for a while.
As I'm creating a new project, I thought it was high time to tidy them
up so they pull out the right files and we can share things like our
inputs.
expand 0 comments
freshlybakedca.ke
submitted
#6
1 commit
expand
collapse
refactor(*): add nilla/etc. in top level directory
Our josh files and combined project pieces have been a mess for a while.
As I'm creating a new project, I thought it was high time to tidy them
up so they pull out the right files and we can share things like our
inputs.
expand 0 comments
freshlybakedca.ke
submitted
#5
1 commit
expand
collapse
refactor(*): add nilla/etc. in top level directory
Our josh files and combined project pieces have been a mess for a while.
As I'm creating a new project, I thought it was high time to tidy them
up so they pull out the right files and we can share things like our
inputs.
expand 0 comments
freshlybakedca.ke
submitted
#4
1 commit
expand
collapse
refactor(*): add nilla/etc. in top level directory
Our josh files and combined project pieces have been a mess for a while.
As I'm creating a new project, I thought it was high time to tidy them
up so they pull out the right files and we can share things like our
inputs.
expand 0 comments
freshlybakedca.ke
submitted
#3
1 commit
expand
collapse
refactor(*): add nilla/etc. in top level directory
Our josh files and combined project pieces have been a mess for a while.
As I'm creating a new project, I thought it was high time to tidy them
up so they pull out the right files and we can share things like our
inputs.
expand 0 comments
freshlybakedca.ke
submitted
#2
1 commit
expand
collapse
refactor(*): add nilla/etc. in top level directory
Our josh files and combined project pieces have been a mess for a while.
As I'm creating a new project, I thought it was high time to tidy them
up so they pull out the right files and we can share things like our
inputs.
expand 0 comments
freshlybakedca.ke
submitted
#1
1 commit
expand
collapse
refactor(*): add nilla/etc. in top level directory
Our josh files and combined project pieces have been a mess for a while.
As I'm creating a new project, I thought it was high time to tidy them
up so they pull out the right files and we can share things like our
inputs.
expand 0 comments
freshlybakedca.ke
submitted
#0
1 commit
expand
collapse
refactor(*): add nilla/etc. in top level directory
Our josh files and combined project pieces have been a mess for a while.
As I'm creating a new project, I thought it was high time to tidy them
up so they pull out the right files and we can share things like our
inputs.