summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2022-03-13 18:35:03 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2022-03-13 18:35:03 +0100
commit1e7de7c2823a9beea7103249b732f14b1b1e8f78 (patch)
treeec073e219d67c52a163ae7ce2ca00737c21d2a31
parent49375b980197db7b4e0d17327b52d37d6ce33f35 (diff)
downloadnixos-1e7de7c2823a9beea7103249b732f14b1b1e8f78.tar
nixos-1e7de7c2823a9beea7103249b732f14b1b1e8f78.tar.gz
nixos-1e7de7c2823a9beea7103249b732f14b1b1e8f78.tar.bz2
nixos-1e7de7c2823a9beea7103249b732f14b1b1e8f78.tar.xz
nixos-1e7de7c2823a9beea7103249b732f14b1b1e8f78.zip
nvfetcher
Diffstat
-rw-r--r--_sources.gup5
-rw-r--r--_sources/generated.json196
-rw-r--r--_sources/generated.nix114
-rw-r--r--accounts/gkleen@sif/default.nix16
-rw-r--r--all.gup4
-rw-r--r--flake.lock55
-rw-r--r--flake.nix29
-rw-r--r--nvfetcher.toml43
-rw-r--r--overlays/afew.nix9
-rw-r--r--overlays/clevis.nix3
-rw-r--r--overlays/fast-cli.nix12
-rw-r--r--overlays/inwx-cdnskey/default.nix2
-rw-r--r--overlays/lego.nix2
-rw-r--r--overlays/ma1sd.nix60
-rw-r--r--overlays/nerdfonts.nix2
-rw-r--r--overlays/nftables-prometheus-exporter/default.nix2
-rw-r--r--overlays/persistent-nix-shell/default.nix2
-rw-r--r--overlays/pidgin.nix57
-rw-r--r--overlays/ppp.nix2
-rw-r--r--overlays/sshpass-secret.nix2
-rw-r--r--overlays/uhk-agent.nix13
-rw-r--r--overlays/urxvt/default.nix2
-rw-r--r--overlays/v4l2loopback.nix12
-rw-r--r--overlays/worktime/default.nix2
-rw-r--r--overlays/xcompose.nix16
-rw-r--r--overlays/zte-prometheus-exporter/default.nix2
-rw-r--r--shell.nix3
-rw-r--r--user-profiles/mpv/default.nix62
28 files changed, 477 insertions, 252 deletions
diff --git a/_sources.gup b/_sources.gup
new file mode 100644
index 00000000..ad9f7161
--- /dev/null
+++ b/_sources.gup
@@ -0,0 +1,5 @@
1#!/usr/bin/env zsh
2
3gup -u nvfetcher.toml
4[[ -d $2 ]] && cp -a $2 $1
5nvfetcher -o $1 \ No newline at end of file
diff --git a/_sources/generated.json b/_sources/generated.json
new file mode 100644
index 00000000..c0e62d6c
--- /dev/null
+++ b/_sources/generated.json
@@ -0,0 +1,196 @@
1{
2 "xcompose": {
3 "pinned": false,
4 "cargoLock": null,
5 "name": "xcompose",
6 "src": {
7 "deepClone": false,
8 "owner": "kragen",
9 "name": null,
10 "repo": "xcompose",
11 "type": "github",
12 "sha256": "sha256-XQ0ZuXGvDLz9fJ0yGHtgL4wl9Jx3SG30cGBM2b947iY=",
13 "rev": "150c47fabb9f45e81138f71347dc75f69b5dd987",
14 "leaveDotGit": false,
15 "fetchSubmodules": false
16 },
17 "version": "150c47fabb9f45e81138f71347dc75f69b5dd987",
18 "passthru": null,
19 "extract": null,
20 "rustGitDeps": null
21 },
22 "fast-cli": {
23 "pinned": false,
24 "cargoLock": null,
25 "name": "fast-cli",
26 "src": {
27 "deepClone": false,
28 "owner": "gesquive",
29 "name": null,
30 "repo": "fast-cli",
31 "type": "github",
32 "sha256": "sha256-j7/3Llc3jTeJGpOH3Aexm9qcNscuk0mbi4ZCCyzC3+s=",
33 "rev": "v0.2.10",
34 "leaveDotGit": false,
35 "fetchSubmodules": false
36 },
37 "version": "v0.2.10",
38 "passthru": null,
39 "extract": null,
40 "rustGitDeps": null
41 },
42 "mpv-createchapter": {
43 "pinned": false,
44 "cargoLock": null,
45 "name": "mpv-createchapter",
46 "src": {
47 "deepClone": false,
48 "owner": "shinchiro",
49 "name": null,
50 "repo": "mpv-createchapter",
51 "type": "github",
52 "sha256": "sha256-rPtG7mgf7tOY8Ih4Bz1tpd4MwXOxJmngjY+s70zWX+g=",
53 "rev": "8dd33e2debbcb963a195ec1371e02c85b49e7faa",
54 "leaveDotGit": false,
55 "fetchSubmodules": false
56 },
57 "version": "8dd33e2debbcb963a195ec1371e02c85b49e7faa",
58 "passthru": null,
59 "extract": null,
60 "rustGitDeps": null
61 },
62 "v4l2loopback": {
63 "pinned": false,
64 "cargoLock": null,
65 "name": "v4l2loopback",
66 "src": {
67 "deepClone": false,
68 "owner": "umlaeute",
69 "name": null,
70 "repo": "v4l2loopback",
71 "type": "github",
72 "sha256": "sha256-lmMPHszAVHWQGYD3Qq68psW3wBm3OQ5kz+dKwJOoRxk=",
73 "rev": "2199283ee936b9930038552b7a0890ec1736e7a2",
74 "leaveDotGit": false,
75 "fetchSubmodules": true
76 },
77 "version": "2199283ee936b9930038552b7a0890ec1736e7a2",
78 "passthru": null,
79 "extract": null,
80 "rustGitDeps": null
81 },
82 "afew": {
83 "pinned": false,
84 "cargoLock": null,
85 "name": "afew",
86 "src": {
87 "deepClone": false,
88 "owner": "gkleen",
89 "name": null,
90 "repo": "afew",
91 "type": "github",
92 "sha256": "sha256-Ipt/EvksMFihSo6t2aoQkjuxAEYdY6P4f1fhLJuGl3g=",
93 "rev": "8ef9a5b73e5d1063cf912c70027c655fb19d1109",
94 "leaveDotGit": true,
95 "fetchSubmodules": false
96 },
97 "version": "8ef9a5b73e5d1063cf912c70027c655fb19d1109",
98 "passthru": null,
99 "extract": null,
100 "rustGitDeps": null
101 },
102 "mpv-reload": {
103 "pinned": false,
104 "cargoLock": null,
105 "name": "mpv-reload",
106 "src": {
107 "deepClone": false,
108 "owner": "4e6",
109 "name": null,
110 "repo": "mpv-reload",
111 "type": "github",
112 "sha256": "sha256-+DoKPIulQA3VSeXo8DjoxnPwDfcuCO5YHpXmB+M7EWk=",
113 "rev": "c1219b6ac3ee3de887e6a36ae41a8e478835ae92",
114 "leaveDotGit": false,
115 "fetchSubmodules": false
116 },
117 "version": "c1219b6ac3ee3de887e6a36ae41a8e478835ae92",
118 "passthru": null,
119 "extract": null,
120 "rustGitDeps": null
121 },
122 "mpv-autosave": {
123 "pinned": false,
124 "cargoLock": null,
125 "name": "mpv-autosave",
126 "src": {
127 "deepClone": false,
128 "url": "https://gist.github.com/2f71a97fb85ed42146f6d9f522bc34ef.git",
129 "name": null,
130 "type": "git",
131 "sha256": "sha256-yxA8wgzdS7SyKLoNTWN87ShsBfPKUflbOu4Y0jS2G3I=",
132 "rev": "744c3ee61d2f0a8e9bb4e308dec6897215ae4704",
133 "leaveDotGit": false,
134 "fetchSubmodules": false
135 },
136 "version": "744c3ee61d2f0a8e9bb4e308dec6897215ae4704",
137 "passthru": null,
138 "extract": null,
139 "rustGitDeps": null
140 },
141 "uhk-agent": {
142 "pinned": false,
143 "cargoLock": null,
144 "name": "uhk-agent",
145 "src": {
146 "url": "https://github.com/UltimateHackingKeyboard/agent/releases/download/v1.5.17/UHK.Agent-1.5.17-linux-x86_64.AppImage",
147 "name": null,
148 "type": "url",
149 "sha256": "sha256-auOoTTRmkXVDDvcmRFzQIStNlbai8bTBLb/KUjk6EAc="
150 },
151 "version": "1.5.17",
152 "passthru": null,
153 "extract": null,
154 "rustGitDeps": null
155 },
156 "mpv-mpris": {
157 "pinned": false,
158 "cargoLock": null,
159 "name": "mpv-mpris",
160 "src": {
161 "deepClone": false,
162 "owner": "hoyon",
163 "name": null,
164 "repo": "mpv-mpris",
165 "type": "github",
166 "sha256": "sha256-kV/d10UCYRb3IDylrU1aCOdyLEegUkwl238Cbzrbd0g=",
167 "rev": "0.7",
168 "leaveDotGit": false,
169 "fetchSubmodules": false
170 },
171 "version": "0.7",
172 "passthru": null,
173 "extract": null,
174 "rustGitDeps": null
175 },
176 "emacs-scratch_el": {
177 "pinned": false,
178 "cargoLock": null,
179 "name": "emacs-scratch_el",
180 "src": {
181 "deepClone": false,
182 "owner": "ffevotte",
183 "name": null,
184 "repo": "scratch.el",
185 "type": "github",
186 "sha256": "sha256-FUkKJ+1COGzgllzzv51yUIjMZI6slOFVExdwWl2ZEBA=",
187 "rev": "0077334cc299aa7885f804d88f52cdb1b35caf71",
188 "leaveDotGit": false,
189 "fetchSubmodules": false
190 },
191 "version": "0077334cc299aa7885f804d88f52cdb1b35caf71",
192 "passthru": null,
193 "extract": null,
194 "rustGitDeps": null
195 }
196} \ No newline at end of file
diff --git a/_sources/generated.nix b/_sources/generated.nix
new file mode 100644
index 00000000..221543dd
--- /dev/null
+++ b/_sources/generated.nix
@@ -0,0 +1,114 @@
1# This file was generated by nvfetcher, please do not modify it manually.
2{ fetchgit, fetchurl, fetchFromGitHub }:
3{
4 afew = {
5 pname = "afew";
6 version = "8ef9a5b73e5d1063cf912c70027c655fb19d1109";
7 src = fetchFromGitHub ({
8 owner = "gkleen";
9 repo = "afew";
10 rev = "8ef9a5b73e5d1063cf912c70027c655fb19d1109";
11 fetchSubmodules = false;
12 deepClone = false;
13 leaveDotGit = true;
14 sha256 = "sha256-Ipt/EvksMFihSo6t2aoQkjuxAEYdY6P4f1fhLJuGl3g=";
15 });
16 };
17 emacs-scratch_el = {
18 pname = "emacs-scratch_el";
19 version = "0077334cc299aa7885f804d88f52cdb1b35caf71";
20 src = fetchFromGitHub ({
21 owner = "ffevotte";
22 repo = "scratch.el";
23 rev = "0077334cc299aa7885f804d88f52cdb1b35caf71";
24 fetchSubmodules = false;
25 sha256 = "sha256-FUkKJ+1COGzgllzzv51yUIjMZI6slOFVExdwWl2ZEBA=";
26 });
27 };
28 fast-cli = {
29 pname = "fast-cli";
30 version = "v0.2.10";
31 src = fetchFromGitHub ({
32 owner = "gesquive";
33 repo = "fast-cli";
34 rev = "v0.2.10";
35 fetchSubmodules = false;
36 sha256 = "sha256-j7/3Llc3jTeJGpOH3Aexm9qcNscuk0mbi4ZCCyzC3+s=";
37 });
38 };
39 mpv-autosave = {
40 pname = "mpv-autosave";
41 version = "744c3ee61d2f0a8e9bb4e308dec6897215ae4704";
42 src = fetchgit {
43 url = "https://gist.github.com/2f71a97fb85ed42146f6d9f522bc34ef.git";
44 rev = "744c3ee61d2f0a8e9bb4e308dec6897215ae4704";
45 fetchSubmodules = false;
46 deepClone = false;
47 leaveDotGit = false;
48 sha256 = "sha256-yxA8wgzdS7SyKLoNTWN87ShsBfPKUflbOu4Y0jS2G3I=";
49 };
50 };
51 mpv-createchapter = {
52 pname = "mpv-createchapter";
53 version = "8dd33e2debbcb963a195ec1371e02c85b49e7faa";
54 src = fetchFromGitHub ({
55 owner = "shinchiro";
56 repo = "mpv-createchapter";
57 rev = "8dd33e2debbcb963a195ec1371e02c85b49e7faa";
58 fetchSubmodules = false;
59 sha256 = "sha256-rPtG7mgf7tOY8Ih4Bz1tpd4MwXOxJmngjY+s70zWX+g=";
60 });
61 };
62 mpv-mpris = {
63 pname = "mpv-mpris";
64 version = "0.7";
65 src = fetchFromGitHub ({
66 owner = "hoyon";
67 repo = "mpv-mpris";
68 rev = "0.7";
69 fetchSubmodules = false;
70 sha256 = "sha256-kV/d10UCYRb3IDylrU1aCOdyLEegUkwl238Cbzrbd0g=";
71 });
72 };
73 mpv-reload = {
74 pname = "mpv-reload";
75 version = "c1219b6ac3ee3de887e6a36ae41a8e478835ae92";
76 src = fetchFromGitHub ({
77 owner = "4e6";
78 repo = "mpv-reload";
79 rev = "c1219b6ac3ee3de887e6a36ae41a8e478835ae92";
80 fetchSubmodules = false;
81 sha256 = "sha256-+DoKPIulQA3VSeXo8DjoxnPwDfcuCO5YHpXmB+M7EWk=";
82 });
83 };
84 uhk-agent = {
85 pname = "uhk-agent";
86 version = "1.5.17";
87 src = fetchurl {
88 url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v1.5.17/UHK.Agent-1.5.17-linux-x86_64.AppImage";
89 sha256 = "sha256-auOoTTRmkXVDDvcmRFzQIStNlbai8bTBLb/KUjk6EAc=";
90 };
91 };
92 v4l2loopback = {
93 pname = "v4l2loopback";
94 version = "2199283ee936b9930038552b7a0890ec1736e7a2";
95 src = fetchFromGitHub ({
96 owner = "umlaeute";
97 repo = "v4l2loopback";
98 rev = "2199283ee936b9930038552b7a0890ec1736e7a2";
99 fetchSubmodules = true;
100 sha256 = "sha256-lmMPHszAVHWQGYD3Qq68psW3wBm3OQ5kz+dKwJOoRxk=";
101 });
102 };
103 xcompose = {
104 pname = "xcompose";
105 version = "150c47fabb9f45e81138f71347dc75f69b5dd987";
106 src = fetchFromGitHub ({
107 owner = "kragen";
108 repo = "xcompose";
109 rev = "150c47fabb9f45e81138f71347dc75f69b5dd987";
110 fetchSubmodules = false;
111 sha256 = "sha256-XQ0ZuXGvDLz9fJ0yGHtgL4wl9Jx3SG30cGBM2b947iY=";
112 });
113 };
114}
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 7c75af98..7e064e6a 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -1,25 +1,15 @@
1{ flake, flakeInputs, userName, pkgs, customUtils, lib, config, ... }@inputs: 1{ flake, flakeInputs, userName, pkgs, customUtils, lib, config, sources, ... }@inputs:
2let 2let
3 cfg = config.home-manager.users.${userName}; 3 cfg = config.home-manager.users.${userName};
4 xmonad = import ./xmonad pkgs.haskellPackages; 4 xmonad = import ./xmonad pkgs.haskellPackages;
5 emacsScratch = pkgs.stdenv.mkDerivation rec { 5 emacsScratch = pkgs.stdenv.mkDerivation (sources.emacs-scratch_el // rec {
6 pname = "scratch";
7 version = "0077334cc299aa7885f804d88f52cdb1b35caf71";
8
9 src = pkgs.fetchFromGitHub {
10 owner = "ffevotte";
11 repo = "scratch.el";
12 rev = version;
13 sha256 = "sha256-FUkKJ+1COGzgllzzv51yUIjMZI6slOFVExdwWl2ZEBA=";
14 };
15
16 phases = [ "installPhase" ]; 6 phases = [ "installPhase" ];
17 7
18 installPhase = '' 8 installPhase = ''
19 mkdir -p $out/share/emacs/site-lisp 9 mkdir -p $out/share/emacs/site-lisp
20 cp $src/scratch.el $out/share/emacs/site-lisp/default.el 10 cp $src/scratch.el $out/share/emacs/site-lisp/default.el
21 ''; 11 '';
22 }; 12 });
23 muteScript = pkgs.stdenv.mkDerivation { 13 muteScript = pkgs.stdenv.mkDerivation {
24 name = "mute"; 14 name = "mute";
25 src = ./scripts/mute.zsh; 15 src = ./scripts/mute.zsh;
diff --git a/all.gup b/all.gup
new file mode 100644
index 00000000..40ab2269
--- /dev/null
+++ b/all.gup
@@ -0,0 +1,4 @@
1#!/usr/bin/env zsh
2
3gup -u _sources
4gup -u flake.lock \ No newline at end of file
diff --git a/flake.lock b/flake.lock
index 4ad8f399..503197cc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -39,6 +39,37 @@
39 "type": "github" 39 "type": "github"
40 } 40 }
41 }, 41 },
42 "flake-compat_2": {
43 "flake": false,
44 "locked": {
45 "lastModified": 1627913399,
46 "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
47 "owner": "edolstra",
48 "repo": "flake-compat",
49 "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
50 "type": "github"
51 },
52 "original": {
53 "owner": "edolstra",
54 "repo": "flake-compat",
55 "type": "github"
56 }
57 },
58 "flake-utils": {
59 "locked": {
60 "lastModified": 1638122382,
61 "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
62 "owner": "numtide",
63 "repo": "flake-utils",
64 "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
65 "type": "github"
66 },
67 "original": {
68 "owner": "numtide",
69 "repo": "flake-utils",
70 "type": "github"
71 }
72 },
42 "home-manager": { 73 "home-manager": {
43 "inputs": { 74 "inputs": {
44 "nixpkgs": [ 75 "nixpkgs": [
@@ -76,11 +107,35 @@
76 "type": "github" 107 "type": "github"
77 } 108 }
78 }, 109 },
110 "nvfetcher": {
111 "inputs": {
112 "flake-compat": "flake-compat_2",
113 "flake-utils": "flake-utils",
114 "nixpkgs": [
115 "nixpkgs"
116 ]
117 },
118 "locked": {
119 "lastModified": 1644123018,
120 "narHash": "sha256-xEhhLmuy4FnT4Zdkf3epPX9T3xqn59yERCsicG4IEyM=",
121 "owner": "berberman",
122 "repo": "nvfetcher",
123 "rev": "9f2cb15c4668859312b6a854d79ad753d5b98b03",
124 "type": "github"
125 },
126 "original": {
127 "owner": "berberman",
128 "ref": "master",
129 "repo": "nvfetcher",
130 "type": "github"
131 }
132 },
79 "root": { 133 "root": {
80 "inputs": { 134 "inputs": {
81 "deploy-rs": "deploy-rs", 135 "deploy-rs": "deploy-rs",
82 "home-manager": "home-manager", 136 "home-manager": "home-manager",
83 "nixpkgs": "nixpkgs", 137 "nixpkgs": "nixpkgs",
138 "nvfetcher": "nvfetcher",
84 "sops-nix": "sops-nix" 139 "sops-nix": "sops-nix"
85 } 140 }
86 }, 141 },
diff --git a/flake.nix b/flake.nix
index 5a62065d..f5008748 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,9 +29,16 @@
29 ref = "master"; 29 ref = "master";
30 inputs.nixpkgs.follows = "nixpkgs"; 30 inputs.nixpkgs.follows = "nixpkgs";
31 }; 31 };
32 nvfetcher = {
33 type = "github";
34 owner = "berberman";
35 repo = "nvfetcher";
36 ref = "master";
37 inputs.nixpkgs.follows = "nixpkgs";
38 };
32 }; 39 };
33 40
34 outputs = { self, nixpkgs, home-manager, sops-nix, deploy-rs, ... }@inputs: 41 outputs = { self, nixpkgs, home-manager, sops-nix, deploy-rs, nvfetcher, ... }@inputs:
35 let 42 let
36 inherit (builtins) attrNames attrValues elemAt toJSON isNull pathExists; 43 inherit (builtins) attrNames attrValues elemAt toJSON isNull pathExists;
37 inherit (nixpkgs) lib; 44 inherit (nixpkgs) lib;
@@ -48,6 +55,10 @@
48 accountName' = splitString "@" accountName; 55 accountName' = splitString "@" accountName;
49 in elemAt accountName' 1; 56 in elemAt accountName' 1;
50 57
58 mkSources = pkgs: optionalAttrs (pathExists _sources/generated.nix) { sources = pkgs.callPackage _sources/generated.nix {}; };
59
60 mkOverlay = path: final: prev: import path ({ inherit final; inherit prev; } // mkSources prev);
61
51 mkNixosConfiguration = addProfiles: dir: path: hostName: nixosSystem rec { 62 mkNixosConfiguration = addProfiles: dir: path: hostName: nixosSystem rec {
52 specialArgs = { 63 specialArgs = {
53 flake = self; 64 flake = self;
@@ -61,9 +72,11 @@
61 ]; 72 ];
62 73
63 local = dir + "/${path}"; 74 local = dir + "/${path}";
64 argsModule._module.args = { 75 argsModule = { pkgs, ... }: {
65 customUtils = utils; 76 _module.args = {
66 inherit hostName; 77 customUtils = utils;
78 inherit hostName;
79 } // mkSources pkgs;
67 }; 80 };
68 accountModules = attrValues (filterAttrs accountMatchesHost self.nixosModules.accounts); 81 accountModules = attrValues (filterAttrs accountMatchesHost self.nixosModules.accounts);
69 accountMatchesHost = n: _v: accountHostName n == hostName; 82 accountMatchesHost = n: _v: accountHostName n == hostName;
@@ -154,7 +167,7 @@
154 homeConfigurations = listToAttrs (concatLists (mapAttrsToList (hostname: nixosConfig: mapAttrsToList (username: configuration: nameValuePair "${username}@${hostname}" { inherit (configuration.home) activationPackage; }) nixosConfig.config.home-manager.users) self.nixosConfigurations)); 167 homeConfigurations = listToAttrs (concatLists (mapAttrsToList (hostname: nixosConfig: mapAttrsToList (username: configuration: nameValuePair "${username}@${hostname}" { inherit (configuration.home) activationPackage; }) nixosConfig.config.home-manager.users) self.nixosConfigurations));
155 168
156 overlays = let 169 overlays = let
157 overlays = mapAttrs (_name: path: import path) overlayPaths; 170 overlays = mapAttrs (_name: path: mkOverlay path) overlayPaths;
158 in overlays // { default = final: prev: composeManyExtensions (attrValues overlays) final prev; }; 171 in overlays // { default = final: prev: composeManyExtensions (attrValues overlays) final prev; };
159 overlays-path = forAllSystems (system: _: self.legacyPackages.${system}.writeText "overlays.nix" '' 172 overlays-path = forAllSystems (system: _: self.legacyPackages.${system}.writeText "overlays.nix" ''
160 map import (builtins.attrValues (builtins.fromJSON ${self.legacyPackages.${system}.lib.strings.escapeNixString (toJSON overlayPaths)})) 173 map import (builtins.attrValues (builtins.fromJSON ${self.legacyPackages.${system}.lib.strings.escapeNixString (toJSON overlayPaths)}))
@@ -167,7 +180,11 @@
167 180
168 apps = activateNixosConfigurations; 181 apps = activateNixosConfigurations;
169 182
170 devShells = forAllSystems (system: systemPkgs: { default = import ./shell.nix { pkgs = self.legacyPackages.${system}; deploy-rs = deploy-rs.defaultPackage.${system}; }; }); 183 devShells = forAllSystems (system: systemPkgs: { default = import ./shell.nix {
184 pkgs = self.legacyPackages.${system};
185 deploy-rs = deploy-rs.packages.${system}.deploy-rs;
186 nvfetcher = nvfetcher.defaultPackage.${system};
187 };});
171 188
172 templates.default = { 189 templates.default = {
173 path = ./.; 190 path = ./.;
diff --git a/nvfetcher.toml b/nvfetcher.toml
new file mode 100644
index 00000000..e82051cd
--- /dev/null
+++ b/nvfetcher.toml
@@ -0,0 +1,43 @@
1[mpv-reload]
2src.git = "https://github.com/4e6/mpv-reload"
3fetch.github = "4e6/mpv-reload"
4
5[mpv-createchapter]
6src.git = "https://github.com/shinchiro/mpv-createchapter"
7fetch.github = "shinchiro/mpv-createchapter"
8
9[mpv-autosave]
10src.git = "https://gist.github.com/2f71a97fb85ed42146f6d9f522bc34ef.git"
11fetch.git = "https://gist.github.com/2f71a97fb85ed42146f6d9f522bc34ef.git"
12
13[mpv-mpris]
14src.github = "hoyon/mpv-mpris"
15fetch.github = "hoyon/mpv-mpris"
16
17[emacs-scratch_el]
18src.git = "https://github.com/ffevotte/scratch.el"
19fetch.github = "ffevotte/scratch.el"
20
21
22[afew]
23src.git = "https://github.com/gkleen/afew"
24fetch.github = "gkleen/afew"
25git.leaveDotGit = true
26
27[uhk-agent]
28src.github = "UltimateHackingKeyboard/agent"
29src.prefix = "v"
30fetch.url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v$ver/UHK.Agent-$ver-linux-x86_64.AppImage"
31
32[v4l2loopback]
33src.git = "https://github.com/umlaeute/v4l2loopback"
34fetch.github = "umlaeute/v4l2loopback"
35git.fetchSubmodules = true
36
37[fast-cli]
38src.github = "gesquive/fast-cli"
39fetch.github = "gesquive/fast-cli"
40
41[xcompose]
42src.git = "https://github.com/kragen/xcompose"
43fetch.github = "kragen/xcompose" \ No newline at end of file
diff --git a/overlays/afew.nix b/overlays/afew.nix
index 5075d678..17331799 100644
--- a/overlays/afew.nix
+++ b/overlays/afew.nix
@@ -1,11 +1,6 @@
1final: prev: { 1{ final, prev, sources, ... }: {
2 afew = prev.afew.overrideAttrs (oldAttrs: { 2 afew = prev.afew.overrideAttrs (oldAttrs: {
3 src = prev.fetchgit { 3 inherit (sources.afew) version afew;
4 url = "https://github.com/gkleen/afew.git";
5 rev = "7b96c73000152188bf8ec9168721f26f5bd01aa6";
6 sha256 = "09pmfyxq2j0rqvdisahpxpskvxckksx6gq9axdc83ppkws25iprm";
7 leaveDotGit = true;
8 };
9 4
10 nativeBuildInputs = oldAttrs.nativeBuildInputs or [] ++ [ final.git ]; 5 nativeBuildInputs = oldAttrs.nativeBuildInputs or [] ++ [ final.git ];
11 }); 6 });
diff --git a/overlays/clevis.nix b/overlays/clevis.nix
index a786340c..1cc1a717 100644
--- a/overlays/clevis.nix
+++ b/overlays/clevis.nix
@@ -1,5 +1,4 @@
1final: prev: 1{ final, prev, ... }: {
2{
3 clevis = prev.clevis.overrideAttrs (oldAttrs: { 2 clevis = prev.clevis.overrideAttrs (oldAttrs: {
4 buildInputs = (oldAttrs.buildInputs or []) ++ [final.tpm2-tools]; 3 buildInputs = (oldAttrs.buildInputs or []) ++ [final.tpm2-tools];
5 nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [final.makeWrapper]; 4 nativeBuildInputs = (oldAttrs.nativeBuildInputs or []) ++ [final.makeWrapper];
diff --git a/overlays/fast-cli.nix b/overlays/fast-cli.nix
index 314d3796..932c5a38 100644
--- a/overlays/fast-cli.nix
+++ b/overlays/fast-cli.nix
@@ -1,14 +1,8 @@
1final: prev: { 1{ final, prev, sources, ... }: {
2 fast-cli = prev.buildGoModule rec { 2 fast-cli = prev.buildGoModule rec {
3 pname = "fast-cli"; 3 pname = "fast-cli";
4 version = "0.2.10";
5 4
6 src = prev.fetchFromGitHub { 5 inherit (sources.fast-cli) version src;
7 owner = "gesquive";
8 repo = pname;
9 rev = "v${version}";
10 hash = "sha256-j7/3Llc3jTeJGpOH3Aexm9qcNscuk0mbi4ZCCyzC3+s=";
11 };
12 vendorSha256 = "sha256-XM/5kUau0JBMxN0UpX6QNI31i8/+HNFvgFUFtlJsBh0="; 6 vendorSha256 = "sha256-XM/5kUau0JBMxN0UpX6QNI31i8/+HNFvgFUFtlJsBh0=";
13 7
14 preBuild = let 8 preBuild = let
@@ -34,7 +28,7 @@ final: prev: {
34 ''; 28 '';
35 29
36 ldflags = [ 30 ldflags = [
37 "-X main.version=${version}" 31 "-X main.version=${prev.lib.removePrefix "v" version}"
38 ]; 32 ];
39 }; 33 };
40} 34}
diff --git a/overlays/inwx-cdnskey/default.nix b/overlays/inwx-cdnskey/default.nix
index c19c2df5..cd564f24 100644
--- a/overlays/inwx-cdnskey/default.nix
+++ b/overlays/inwx-cdnskey/default.nix
@@ -1,4 +1,4 @@
1final: prev: 1{ final, prev, ... }:
2let 2let
3 packageOverrides = final.callPackage ./python-packages.nix {}; 3 packageOverrides = final.callPackage ./python-packages.nix {};
4 inpPython = final.python39.override { inherit packageOverrides; }; 4 inpPython = final.python39.override { inherit packageOverrides; };
diff --git a/overlays/lego.nix b/overlays/lego.nix
index 80e9bd4b..83b1e2e8 100644
--- a/overlays/lego.nix
+++ b/overlays/lego.nix
@@ -1,4 +1,4 @@
1final: prev: { 1{ final, prev, ... }: {
2 lego = prev.lego.override { 2 lego = prev.lego.override {
3 buildGoModule = args: prev.buildGoModule (args // { 3 buildGoModule = args: prev.buildGoModule (args // {
4 patches = (args.patches or []) ++ prev.lib.lists.singleton (prev.fetchpatch { 4 patches = (args.patches or []) ++ prev.lib.lists.singleton (prev.fetchpatch {
diff --git a/overlays/ma1sd.nix b/overlays/ma1sd.nix
deleted file mode 100644
index 3218879b..00000000
--- a/overlays/ma1sd.nix
+++ /dev/null
@@ -1,60 +0,0 @@
1final: prev: {
2 ma1sd = let
3 pname = "ma1sd";
4 version = "2.5.0";
5 rev = version;
6
7 src = prev.fetchFromGitHub {
8 inherit rev;
9 owner = "ma1uta";
10 repo = "ma1sd";
11 hash = "sha256-K3kaujAhWsRQuTMW3SZOnE7Rmu8+tDXaxpLrb45OI4A=";
12 };
13
14
15 deps = prev.stdenv.mkDerivation {
16 pname = "${pname}-deps";
17 inherit src version;
18 nativeBuildInputs = with final; [ gradle_6 perl git ];
19
20 buildPhase = ''
21 export MA1SD_BUILD_VERSION=${rev}
22 export GRADLE_USER_HOME=$(mktemp -d);
23 gradle --no-daemon build -x test
24 '';
25
26 # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar)
27 installPhase = ''
28 find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
29 | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
30 | sh
31 '';
32
33 dontStrip = true;
34
35 outputHashAlgo = "sha256";
36 outputHashMode = "recursive";
37 outputHash = "sha256-P81aY1rOnZdb2UskPIrBe8dfWAicJ3TivBv/NEns5ro=";
38 };
39 in prev.stdenv.mkDerivation {
40 inherit pname src version;
41 nativeBuildInputs = with final; [ gradle_6 perl makeWrapper ];
42 buildInputs = with final; [ jre ];
43
44 buildPhase = ''
45 runHook preBuild
46 export MA1SD_BUILD_VERSION=${rev}
47 export GRADLE_USER_HOME=$(mktemp -d)
48 sed -ie "s#mavenCentral()#mavenLocal(); maven { url '${deps}' }#g; s#mavenCentral()##g" build.gradle
49 gradle --offline --no-daemon build -x test
50 runHook postBuild
51 '';
52
53 installPhase = ''
54 runHook preInstall
55 install -D build/libs/source.jar $out/lib/ma1sd.jar
56 makeWrapper ${final.jre}/bin/java $out/bin/ma1sd --add-flags "-jar $out/lib/ma1sd.jar"
57 runHook postInstall
58 '';
59 };
60}
diff --git a/overlays/nerdfonts.nix b/overlays/nerdfonts.nix
index 28581d72..f4fc6f14 100644
--- a/overlays/nerdfonts.nix
+++ b/overlays/nerdfonts.nix
@@ -1,4 +1,4 @@
1final: prev: { 1{ final, prev, ... }: {
2 nerdfonts = prev.nerdfonts.override { 2 nerdfonts = prev.nerdfonts.override {
3 fonts = ["FiraMono" "FiraCode"]; 3 fonts = ["FiraMono" "FiraCode"];
4 }; 4 };
diff --git a/overlays/nftables-prometheus-exporter/default.nix b/overlays/nftables-prometheus-exporter/default.nix
index 452f160f..aab0c8e9 100644
--- a/overlays/nftables-prometheus-exporter/default.nix
+++ b/overlays/nftables-prometheus-exporter/default.nix
@@ -1,4 +1,4 @@
1final: prev: 1{ final, prev, ... }:
2let 2let
3 inpPython = final.python310; 3 inpPython = final.python310;
4in { 4in {
diff --git a/overlays/persistent-nix-shell/default.nix b/overlays/persistent-nix-shell/default.nix
index 60396335..c36b9e86 100644
--- a/overlays/persistent-nix-shell/default.nix
+++ b/overlays/persistent-nix-shell/default.nix
@@ -1,4 +1,4 @@
1final: prev: { 1{ final, prev, ... }: {
2 persistent-nix-shell = prev.stdenv.mkDerivation { 2 persistent-nix-shell = prev.stdenv.mkDerivation {
3 name = "persistent-nix-shell"; 3 name = "persistent-nix-shell";
4 src = ./persistent-nix-shell; 4 src = ./persistent-nix-shell;
diff --git a/overlays/pidgin.nix b/overlays/pidgin.nix
deleted file mode 100644
index 4c315f55..00000000
--- a/overlays/pidgin.nix
+++ /dev/null
@@ -1,57 +0,0 @@
1final: prev:
2let
3 mucHistory = prev.fetchpatch {
4 url = "https://developer.pidgin.im/raw-attachment/ticket/16524/0001-only-request-unseed-chat-history-from-jabber-group-c.patch";
5 sha256 = "083wvmq7417xz55fxxhllqwql1hgjvin2sak08844121yw1jvc44";
6 };
7
8 pidginWrapper = { symlinkJoin, pidgin, makeWrapper, plugins }:
9 let
10 extraArgs = map (x: x.wrapArgs or "") plugins;
11 majorVersion = prev.lib.versions.major pidgin.version;
12 in symlinkJoin {
13 name = "pidgin-with-plugins-${pidgin.version}";
14
15 paths = [ pidgin ] ++ plugins;
16
17 buildInputs = [ makeWrapper ];
18
19 postBuild = ''
20 wrapProgram $out/bin/pidgin \
21 --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${majorVersion} $out/lib/pidgin" \
22 ${toString extraArgs}
23 wrapProgram $out/bin/finch \
24 --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${majorVersion}" \
25 ${toString extraArgs}
26 '';
27 };
28in {
29 pidgin-rocketchat = let
30 rev = "5c08ad0eacd39914d27b692d7eb42a94a991fb4c";
31 in prev.stdenv.mkDerivation {
32 pname = "pidgin-rocketchat";
33 version = builtins.substring 0 8 rev;
34
35 src = prev.fetchFromGitHub {
36 owner = "EionRobb";
37 repo = "purple-rocketchat";
38 inherit rev;
39 hash = "sha256-UBIp5tpj4Xfo+mPhY51+rzs+ojKr90zWK+XLiK7XvWM=";
40 };
41
42 nativeBuildInputs = with final; [ pidgin json-glib glib discount ];
43
44 installFlags = [
45 "ROCKETCHAT_DEST=$(out)/lib/purple-2"
46 "ROCKETCHAT_ICONS_DEST=$(out)/share/pixmaps/pidgin/protocols"
47 ];
48 };
49
50 pidgin-with-plugins = pidginWrapper {
51 inherit (prev) makeWrapper symlinkJoin;
52 plugins = with final; [ purple-lurch pidgin-carbons pidgin-opensteamworks pidgin-xmpp-receipts pidgin-rocketchat ];
53 pidgin = prev.pidgin.overrideAttrs (oldAttrs: {
54 patches = (oldAttrs.patches or []) ++ [mucHistory];
55 });
56 };
57}
diff --git a/overlays/ppp.nix b/overlays/ppp.nix
index 38aeaef0..8c6b0798 100644
--- a/overlays/ppp.nix
+++ b/overlays/ppp.nix
@@ -1,4 +1,4 @@
1final: prev: { 1{ final, prev, ... }: {
2 ppp = prev.ppp.overrideAttrs (oldAttrs: { 2 ppp = prev.ppp.overrideAttrs (oldAttrs: {
3 buildInputs = (oldAttrs.buildInputs or []) ++ [ final.systemd ]; 3 buildInputs = (oldAttrs.buildInputs or []) ++ [ final.systemd ];
4 makeFlags = (oldAttrs.makeFlags or []) ++ [ "SYSTEMD=yes" ]; 4 makeFlags = (oldAttrs.makeFlags or []) ++ [ "SYSTEMD=yes" ];
diff --git a/overlays/sshpass-secret.nix b/overlays/sshpass-secret.nix
index 2f3d6169..388471cb 100644
--- a/overlays/sshpass-secret.nix
+++ b/overlays/sshpass-secret.nix
@@ -1,4 +1,4 @@
1final: prev: { 1{ final, prev, ... }: {
2 sshpassSecret = prev.writeScriptBin "sshpass-secret" '' 2 sshpassSecret = prev.writeScriptBin "sshpass-secret" ''
3 #!${final.zsh}/bin/zsh -e 3 #!${final.zsh}/bin/zsh -e
4 4
diff --git a/overlays/uhk-agent.nix b/overlays/uhk-agent.nix
index 1b37121f..fcf66c0b 100644
--- a/overlays/uhk-agent.nix
+++ b/overlays/uhk-agent.nix
@@ -1,19 +1,12 @@
1final: prev: 1{ final, prev, sources, ... }:
2{ 2{
3 uhk-agent = 3 uhk-agent =
4 let 4 let
5 version = "1.5.15"; 5 image = prev.stdenv.mkDerivation (sources.uhk-agent // {
6
7 image = prev.stdenv.mkDerivation {
8 name = "uhk-agent-image";
9 src = prev.fetchurl {
10 url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage";
11 hash = "sha256-t2Jwd/x0eTZ4xBaCb/FomH/zSRLt7IIERUF9n9ONCpE=";
12 };
13 buildCommand = '' 6 buildCommand = ''
14 install -m 0644 $src $out 7 install -m 0644 $src $out
15 ''; 8 '';
16 }; 9 });
17 10
18 appimage-run' = prev.appimage-run.override { 11 appimage-run' = prev.appimage-run.override {
19 extraPkgs = p: with p; [ 12 extraPkgs = p: with p; [
diff --git a/overlays/urxvt/default.nix b/overlays/urxvt/default.nix
index 3c57d000..77a2c51f 100644
--- a/overlays/urxvt/default.nix
+++ b/overlays/urxvt/default.nix
@@ -1,4 +1,4 @@
1final: prev: { 1{ final, prev, ... }: {
2 rxvt_unicode-with-plugins = prev.rxvt-unicode.override { 2 rxvt_unicode-with-plugins = prev.rxvt-unicode.override {
3 configure = { availablePlugins, ... }: { 3 configure = { availablePlugins, ... }: {
4 plugins = [ final.urxvt_osc_52 ] ++ builtins.attrValues availablePlugins; 4 plugins = [ final.urxvt_osc_52 ] ++ builtins.attrValues availablePlugins;
diff --git a/overlays/v4l2loopback.nix b/overlays/v4l2loopback.nix
index 335f86a3..bb59961f 100644
--- a/overlays/v4l2loopback.nix
+++ b/overlays/v4l2loopback.nix
@@ -1,16 +1,8 @@
1final: prev: { 1{ final, prev, sources, ... }: {
2 linuxPackages_latest = prev.linuxPackages_latest.extend (self: super: { 2 linuxPackages_latest = prev.linuxPackages_latest.extend (self: super: {
3 v4l2loopback = super.stdenv.mkDerivation rec { 3 v4l2loopback = super.stdenv.mkDerivation rec {
4 name = "v4l2loopback-${version}-${self.kernel.version}"; 4 name = "v4l2loopback-${version}-${self.kernel.version}";
5 version = "f62fb9076b6313e5eb82fdcaceadb6b3052f346e"; 5 inherit (sources.v4l2loopback) version src;
6
7 src = prev.fetchFromGitHub {
8 owner = "umlaeute";
9 repo = "v4l2loopback";
10 rev = "${version}";
11 sha256 = "VRFtimQQtT8vd1dx5KtUDkmXo3DSOybhNLcAIxQba44=";
12 fetchSubmodules = true;
13 };
14 6
15 hardeningDisable = [ "format" "pic" ]; 7 hardeningDisable = [ "format" "pic" ];
16 8
diff --git a/overlays/worktime/default.nix b/overlays/worktime/default.nix
index a8fe79c6..4322f719 100644
--- a/overlays/worktime/default.nix
+++ b/overlays/worktime/default.nix
@@ -1,4 +1,4 @@
1final: prev: { 1{ final, prev, ... }: {
2 worktime = prev.stdenv.mkDerivation rec { 2 worktime = prev.stdenv.mkDerivation rec {
3 name = "worktime"; 3 name = "worktime";
4 src = ./worktime.py; 4 src = ./worktime.py;
diff --git a/overlays/xcompose.nix b/overlays/xcompose.nix
index 2bcd6c01..e7603b83 100644
--- a/overlays/xcompose.nix
+++ b/overlays/xcompose.nix
@@ -1,17 +1,5 @@
1final: prev: { 1{ final, prev, sources, ... }: {
2 xcompose = prev.stdenv.mkDerivation (let 2 xcompose = prev.stdenv.mkDerivation (sources.xcompose // {
3 rev = "150c47fabb9f45e81138f71347dc75f69b5dd987";
4 in {
5 pname = "xcompose";
6 version = builtins.substring 0 8 rev;
7
8 src = prev.fetchFromGitHub {
9 owner = "kragen";
10 repo = "xcompose";
11 inherit rev;
12 hash = "sha256-XQ0ZuXGvDLz9fJ0yGHtgL4wl9Jx3SG30cGBM2b947iY=";
13 };
14
15 nativeBuildInputs = with final; [ perl ]; 3 nativeBuildInputs = with final; [ perl ];
16 4
17 postPatch = '' 5 postPatch = ''
diff --git a/overlays/zte-prometheus-exporter/default.nix b/overlays/zte-prometheus-exporter/default.nix
index 1609724b..2188e7b3 100644
--- a/overlays/zte-prometheus-exporter/default.nix
+++ b/overlays/zte-prometheus-exporter/default.nix
@@ -1,4 +1,4 @@
1final: prev: 1{ final, prev, ... }:
2let 2let
3 packageOverrides = final.callPackage ./python-packages.nix {}; 3 packageOverrides = final.callPackage ./python-packages.nix {};
4 inpPython = final.python310.override { inherit packageOverrides; }; 4 inpPython = final.python310.override { inherit packageOverrides; };
diff --git a/shell.nix b/shell.nix
index 233d1cbe..05ba992b 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,4 +1,4 @@
1{ pkgs ? import <nixpkgs> {}, deploy-rs }: 1{ pkgs ? import <nixpkgs> {}, deploy-rs, nvfetcher }:
2let 2let
3 nixWithFlakes = pkgs.symlinkJoin { 3 nixWithFlakes = pkgs.symlinkJoin {
4 name = "nix-with-flakes"; 4 name = "nix-with-flakes";
@@ -24,5 +24,6 @@ in pkgs.mkShell {
24 tai64dec 24 tai64dec
25 knot-dns 25 knot-dns
26 yq 26 yq
27 nvfetcher
27 ]; 28 ];
28} 29}
diff --git a/user-profiles/mpv/default.nix b/user-profiles/mpv/default.nix
index f6f9b8b2..4d6e3ea6 100644
--- a/user-profiles/mpv/default.nix
+++ b/user-profiles/mpv/default.nix
@@ -1,4 +1,4 @@
1{ config, lib, userName, pkgs, ... }: 1{ config, lib, userName, pkgs, sources, ... }:
2{ 2{
3 home-manager.users.${userName}.programs.mpv = { 3 home-manager.users.${userName}.programs.mpv = {
4 enable = true; 4 enable = true;
@@ -21,75 +21,31 @@
21 ]; 21 ];
22 }; 22 };
23 scripts = [ 23 scripts = [
24 (pkgs.stdenv.mkDerivation rec { 24 (pkgs.stdenv.mkDerivation (sources.mpv-reload // rec {
25 version = "2b8a719f";
26 pname = "reload";
27 name = "${pname}-${version}";
28
29 src = pkgs.fetchFromGitHub {
30 owner = "4e6";
31 repo = "mpv-reload";
32 rev = "2b8a719fe166d6d42b5f1dd64761f97997b54a86";
33 sha256 = "19ycvnwzf8vgv0g63d4k1ll6hlfrd92is9gl8hzfic7w32ycphbg";
34 };
35
36 installPhase = '' 25 installPhase = ''
37 install -d $out/share/mpv/scripts 26 install -d $out/share/mpv/scripts
38 install -m 0644 reload.lua $out/share/mpv/scripts/${passthru.scriptName} 27 install -m 0644 reload.lua $out/share/mpv/scripts/${passthru.scriptName}
39 ''; 28 '';
40 29
41 passthru.scriptName = "reload.lua"; 30 passthru.scriptName = "reload.lua";
42 }) 31 }))
43 (pkgs.stdenv.mkDerivation rec { 32 (pkgs.stdenv.mkDerivation (sources.mpv-createchapter // rec {
44 version = "8dd33e2d";
45 pname = "createchapter";
46 name = "${pname}-${version}";
47
48 src = pkgs.fetchFromGitHub {
49 owner = "shinchiro";
50 repo = "mpv-createchapter";
51 rev = "8dd33e2debbcb963a195ec1371e02c85b49e7faa";
52 hash = "sha256-rPtG7mgf7tOY8Ih4Bz1tpd4MwXOxJmngjY+s70zWX+g=";
53 };
54
55 installPhase = '' 33 installPhase = ''
56 install -d $out/share/mpv/scripts 34 install -d $out/share/mpv/scripts
57 install -m 0644 createchapter.lua $out/share/mpv/scripts/${passthru.scriptName} 35 install -m 0644 createchapter.lua $out/share/mpv/scripts/${passthru.scriptName}
58 ''; 36 '';
59 37
60 passthru.scriptName = "createchapter.lua"; 38 passthru.scriptName = "createchapter.lua";
61 }) 39 }))
62 (pkgs.stdenv.mkDerivation rec { 40 (pkgs.stdenv.mkDerivation (sources.mpv-autosave // rec {
63 version = "744c3ee6";
64 pname = "autosave";
65 name = "${pname}-${version}.lua";
66
67 src = pkgs.fetchzip {
68 url = "https://gist.github.com/CyberShadow/2f71a97fb85ed42146f6d9f522bc34ef/archive/744c3ee61d2f0a8e9bb4e308dec6897215ae4704.zip";
69 hash = "sha256-yxA8wgzdS7SyKLoNTWN87ShsBfPKUflbOu4Y0jS2G3I=";
70 # url = "https://gist.github.com/Hakkin/5489e511bd6c8068a0fc09304c9c5a82/archive/7a19f7cdb6dd0b1c6878b41e13b244e2503c15fc.zip";
71 # sha256 = "0bv9wjrqm2ragd7rp8vw768bja2ghascwlljd6rzzf2ybi10fxs2";
72 };
73
74 installPhase = '' 41 installPhase = ''
75 install -d $out/share/mpv/scripts 42 install -d $out/share/mpv/scripts
76 install -m 0644 autosave.lua $out/share/mpv/scripts/${passthru.scriptName} 43 install -m 0644 autosave.lua $out/share/mpv/scripts/${passthru.scriptName}
77 ''; 44 '';
78 45
79 passthru.scriptName = "autosave.lua"; 46 passthru.scriptName = "autosave.lua";
80 }) 47 }))
81 (pkgs.stdenv.mkDerivation rec { 48 (pkgs.stdenv.mkDerivation (sources.mpv-mpris // rec {
82 version = "0.4";
83 pname = "mpv-mpris";
84 name = "${pname}-${version}.so";
85
86 src = pkgs.fetchFromGitHub {
87 owner = "hoyon";
88 repo = "mpv-mpris";
89 rev = version;
90 sha256 = "1fr3jvja8s2gdpx8qyk9r17977flms3qpm8zci62nd9r5wjdvr5i";
91 };
92
93 installPhase = '' 49 installPhase = ''
94 install -d $out/share/mpv/scripts 50 install -d $out/share/mpv/scripts
95 install -m 0644 mpris.so $out/share/mpv/scripts/${passthru.scriptName} 51 install -m 0644 mpris.so $out/share/mpv/scripts/${passthru.scriptName}
@@ -98,7 +54,7 @@
98 nativeBuildInputs = with pkgs; [ pkgconfig glib mpv ]; 54 nativeBuildInputs = with pkgs; [ pkgconfig glib mpv ];
99 55
100 passthru.scriptName = "mpris.so"; 56 passthru.scriptName = "mpris.so";
101 }) 57 }))
102 ]; 58 ];
103 }; 59 };
104} 60}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 03:46:58 +0000