summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2022-06-28 09:46:04 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2022-06-28 09:46:04 +0200
commitdacafd3cd7f0656ebf12f2845b17224a121b693f (patch)
tree84019e3443190ca1be84e06ed03a750b83c1d502
parent3a85c6891dc862ec39ccd53dbd7424b8b5264a34 (diff)
downloadnixos-dacafd3cd7f0656ebf12f2845b17224a121b693f.tar
nixos-dacafd3cd7f0656ebf12f2845b17224a121b693f.tar.gz
nixos-dacafd3cd7f0656ebf12f2845b17224a121b693f.tar.bz2
nixos-dacafd3cd7f0656ebf12f2845b17224a121b693f.tar.xz
nixos-dacafd3cd7f0656ebf12f2845b17224a121b693f.zip
...
-rw-r--r--_sources/generated.json26
-rw-r--r--_sources/generated.nix20
-rw-r--r--accounts/gkleen@sif/default.nix1
-rw-r--r--accounts/gkleen@sif/zshrc8
-rw-r--r--flake.lock60
-rw-r--r--flake.nix15
-rw-r--r--nvfetcher.toml7
-rw-r--r--overlays/lesspipe.nix23
-rw-r--r--system-profiles/core.nix2
-rw-r--r--user-profiles/utils.nix4
10 files changed, 150 insertions, 16 deletions
diff --git a/_sources/generated.json b/_sources/generated.json
index a1e60700..9e718609 100644
--- a/_sources/generated.json
+++ b/_sources/generated.json
@@ -56,6 +56,20 @@
56 }, 56 },
57 "version": "v0.2.10" 57 "version": "v0.2.10"
58 }, 58 },
59 "lesspipe": {
60 "cargoLocks": null,
61 "extract": null,
62 "name": "lesspipe",
63 "passthru": null,
64 "pinned": false,
65 "src": {
66 "name": null,
67 "sha256": "sha256-eOq2PYvLB6ueIjC8Rif/p7HJKW8AkbEjf1La9/HUaC8=",
68 "type": "url",
69 "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.05.tar.gz"
70 },
71 "version": "2.05"
72 },
59 "mpv-autosave": { 73 "mpv-autosave": {
60 "cargoLocks": null, 74 "cargoLocks": null,
61 "extract": null, 75 "extract": null,
@@ -125,11 +139,11 @@
125 "name": null, 139 "name": null,
126 "owner": "hoyon", 140 "owner": "hoyon",
127 "repo": "mpv-mpris", 141 "repo": "mpv-mpris",
128 "rev": "0.7.1", 142 "rev": "0.8.1",
129 "sha256": "sha256-Oc+PI4dGJdqja75JB2sT18NbU9kzIXYTi+eQdGxwRG0=", 143 "sha256": "sha256-ugEiQZA1vQCVwyv3ViM84Qz8lhRvy17vcxjayYevTAs=",
130 "type": "github" 144 "type": "github"
131 }, 145 },
132 "version": "0.7.1" 146 "version": "0.8.1"
133 }, 147 },
134 "mpv-reload": { 148 "mpv-reload": {
135 "cargoLocks": null, 149 "cargoLocks": null,
@@ -195,11 +209,11 @@
195 "name": null, 209 "name": null,
196 "owner": "umlaeute", 210 "owner": "umlaeute",
197 "repo": "v4l2loopback", 211 "repo": "v4l2loopback",
198 "rev": "d01c20cca58772e7b29faef6da393c919a4d531b", 212 "rev": "56cca901dcf0a5cb11cc613155cfbe863d5d8421",
199 "sha256": "sha256-/HBU+FThl8qtgpJ4rHj9tbKxK+aTbccl7BhWVvzNDlU=", 213 "sha256": "sha256-NY9elPsoGQVGGDIe2US/HT0ES8NSmb0ohlABc0HEIP0=",
200 "type": "github" 214 "type": "github"
201 }, 215 },
202 "version": "d01c20cca58772e7b29faef6da393c919a4d531b" 216 "version": "56cca901dcf0a5cb11cc613155cfbe863d5d8421"
203 }, 217 },
204 "xcompose": { 218 "xcompose": {
205 "cargoLocks": null, 219 "cargoLocks": null,
diff --git a/_sources/generated.nix b/_sources/generated.nix
index 5096c4f1..def59267 100644
--- a/_sources/generated.nix
+++ b/_sources/generated.nix
@@ -36,6 +36,14 @@
36 sha256 = "sha256-j7/3Llc3jTeJGpOH3Aexm9qcNscuk0mbi4ZCCyzC3+s="; 36 sha256 = "sha256-j7/3Llc3jTeJGpOH3Aexm9qcNscuk0mbi4ZCCyzC3+s=";
37 }); 37 });
38 }; 38 };
39 lesspipe = {
40 pname = "lesspipe";
41 version = "2.05";
42 src = fetchurl {
43 url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.05.tar.gz";
44 sha256 = "sha256-eOq2PYvLB6ueIjC8Rif/p7HJKW8AkbEjf1La9/HUaC8=";
45 };
46 };
39 mpv-autosave = { 47 mpv-autosave = {
40 pname = "mpv-autosave"; 48 pname = "mpv-autosave";
41 version = "744c3ee61d2f0a8e9bb4e308dec6897215ae4704"; 49 version = "744c3ee61d2f0a8e9bb4e308dec6897215ae4704";
@@ -72,13 +80,13 @@
72 }; 80 };
73 mpv-mpris = { 81 mpv-mpris = {
74 pname = "mpv-mpris"; 82 pname = "mpv-mpris";
75 version = "0.7.1"; 83 version = "0.8.1";
76 src = fetchFromGitHub ({ 84 src = fetchFromGitHub ({
77 owner = "hoyon"; 85 owner = "hoyon";
78 repo = "mpv-mpris"; 86 repo = "mpv-mpris";
79 rev = "0.7.1"; 87 rev = "0.8.1";
80 fetchSubmodules = false; 88 fetchSubmodules = false;
81 sha256 = "sha256-Oc+PI4dGJdqja75JB2sT18NbU9kzIXYTi+eQdGxwRG0="; 89 sha256 = "sha256-ugEiQZA1vQCVwyv3ViM84Qz8lhRvy17vcxjayYevTAs=";
82 }); 90 });
83 }; 91 };
84 mpv-reload = { 92 mpv-reload = {
@@ -114,13 +122,13 @@
114 }; 122 };
115 v4l2loopback = { 123 v4l2loopback = {
116 pname = "v4l2loopback"; 124 pname = "v4l2loopback";
117 version = "d01c20cca58772e7b29faef6da393c919a4d531b"; 125 version = "56cca901dcf0a5cb11cc613155cfbe863d5d8421";
118 src = fetchFromGitHub ({ 126 src = fetchFromGitHub ({
119 owner = "umlaeute"; 127 owner = "umlaeute";
120 repo = "v4l2loopback"; 128 repo = "v4l2loopback";
121 rev = "d01c20cca58772e7b29faef6da393c919a4d531b"; 129 rev = "56cca901dcf0a5cb11cc613155cfbe863d5d8421";
122 fetchSubmodules = true; 130 fetchSubmodules = true;
123 sha256 = "sha256-/HBU+FThl8qtgpJ4rHj9tbKxK+aTbccl7BhWVvzNDlU="; 131 sha256 = "sha256-NY9elPsoGQVGGDIe2US/HT0ES8NSmb0ohlABc0HEIP0=";
124 }); 132 });
125 }; 133 };
126 xcompose = { 134 xcompose = {
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 892cd58b..66328970 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -378,6 +378,7 @@ in {
378 i.A. 378 i.A.
379 d.h. 379 d.h.
380 D.h. 380 D.h.
381 gdw.
381 ''} \ 382 ''} \
382 | sort | uniq >$out 383 | sort | uniq >$out
383 ''); 384 '');
diff --git a/accounts/gkleen@sif/zshrc b/accounts/gkleen@sif/zshrc
index 2d71f5a3..1b7cc06c 100644
--- a/accounts/gkleen@sif/zshrc
+++ b/accounts/gkleen@sif/zshrc
@@ -181,8 +181,14 @@ dir() {
181 templateArchive=${archiveFile} 181 templateArchive=${archiveFile}
182 fi 182 fi
183 183
184 case $(file --brief --mime-type ${templateArchive}) in 184 case $(file --brief --mime-type --dereference ${templateArchive}) in
185 application/zip) unzip ${templateArchive} ;; 185 application/zip) unzip ${templateArchive} ;;
186 application/vnd.debian.binary-package)
187 nix shell nixos#binutils --command ar x ${templateArchive}
188 mkdir control data
189 tar -C control -xvaf control.*
190 tar -C data -xvaf data.*
191 ;;
186 *) tar -xvaf ${templateArchive} ;; 192 *) tar -xvaf ${templateArchive} ;;
187 esac 193 esac
188 ) 194 )
diff --git a/flake.lock b/flake.lock
index 78ef3227..48609f3c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -44,6 +44,21 @@
44 }, 44 },
45 "flake-utils": { 45 "flake-utils": {
46 "locked": { 46 "locked": {
47 "lastModified": 1642700792,
48 "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
49 "owner": "numtide",
50 "repo": "flake-utils",
51 "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
52 "type": "github"
53 },
54 "original": {
55 "owner": "numtide",
56 "repo": "flake-utils",
57 "type": "github"
58 }
59 },
60 "flake-utils_2": {
61 "locked": {
47 "lastModified": 1649676176, 62 "lastModified": 1649676176,
48 "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", 63 "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
49 "owner": "numtide", 64 "owner": "numtide",
@@ -84,6 +99,31 @@
84 "type": "github" 99 "type": "github"
85 } 100 }
86 }, 101 },
102 "mach-nix": {
103 "inputs": {
104 "flake-utils": "flake-utils",
105 "nixpkgs": [
106 "nixpkgs"
107 ],
108 "pypi-deps-db": [
109 "pypi-deps-db"
110 ]
111 },
112 "locked": {
113 "lastModified": 1655849525,
114 "narHash": "sha256-j/XrVVistvM+Ua+0tNFvO5z83isL+LBgmBi9XppxuKA=",
115 "owner": "DavHau",
116 "repo": "mach-nix",
117 "rev": "552d4caa73722b262204319526f9e77f9370f702",
118 "type": "github"
119 },
120 "original": {
121 "owner": "DavHau",
122 "ref": "master",
123 "repo": "mach-nix",
124 "type": "github"
125 }
126 },
87 "nixpkgs": { 127 "nixpkgs": {
88 "locked": { 128 "locked": {
89 "lastModified": 1655630673, 129 "lastModified": 1655630673,
@@ -169,7 +209,7 @@
169 "flake-compat": [ 209 "flake-compat": [
170 "flake-compat" 210 "flake-compat"
171 ], 211 ],
172 "flake-utils": "flake-utils", 212 "flake-utils": "flake-utils_2",
173 "nixpkgs": [ 213 "nixpkgs": [
174 "nixpkgs" 214 "nixpkgs"
175 ] 215 ]
@@ -189,13 +229,31 @@
189 "type": "github" 229 "type": "github"
190 } 230 }
191 }, 231 },
232 "pypi-deps-db": {
233 "flake": false,
234 "locked": {
235 "lastModified": 1656230916,
236 "narHash": "sha256-ySccLr2XgC9kiLwt/g+tjGyf03iwnAh1Odj3EZ+mZ/o=",
237 "owner": "DavHau",
238 "repo": "pypi-deps-db",
239 "rev": "76e139c4fc7d8201dd1c437ba15761c982d6d4dd",
240 "type": "github"
241 },
242 "original": {
243 "owner": "DavHau",
244 "repo": "pypi-deps-db",
245 "type": "github"
246 }
247 },
192 "root": { 248 "root": {
193 "inputs": { 249 "inputs": {
194 "deploy-rs": "deploy-rs", 250 "deploy-rs": "deploy-rs",
195 "flake-compat": "flake-compat", 251 "flake-compat": "flake-compat",
196 "home-manager": "home-manager", 252 "home-manager": "home-manager",
253 "mach-nix": "mach-nix",
197 "nixpkgs": "nixpkgs", 254 "nixpkgs": "nixpkgs",
198 "nvfetcher": "nvfetcher", 255 "nvfetcher": "nvfetcher",
256 "pypi-deps-db": "pypi-deps-db",
199 "sops-nix": "sops-nix" 257 "sops-nix": "sops-nix"
200 } 258 }
201 }, 259 },
diff --git a/flake.nix b/flake.nix
index da73fa6e..97fb4204 100644
--- a/flake.nix
+++ b/flake.nix
@@ -52,6 +52,21 @@
52 ref = "master"; 52 ref = "master";
53 flake = false; 53 flake = false;
54 }; 54 };
55
56 pypi-deps-db = {
57 url = "github:DavHau/pypi-deps-db";
58 flake = false;
59 };
60 mach-nix = {
61 type = "github";
62 owner = "DavHau";
63 repo = "mach-nix";
64 ref = "master";
65 inputs = {
66 nixpkgs.follows = "nixpkgs";
67 pypi-deps-db.follows = "pypi-deps-db";
68 };
69 };
55 }; 70 };
56 71
57 outputs = { self, nixpkgs, home-manager, sops-nix, deploy-rs, nvfetcher, ... }@inputs: 72 outputs = { self, nixpkgs, home-manager, sops-nix, deploy-rs, nvfetcher, ... }@inputs:
diff --git a/nvfetcher.toml b/nvfetcher.toml
index 31fa7aa4..bc3095ca 100644
--- a/nvfetcher.toml
+++ b/nvfetcher.toml
@@ -48,4 +48,9 @@ fetch.git = "https://gitlab.com/depesz/Versioning"
48 48
49[mpv-chapterskip] 49[mpv-chapterskip]
50src.git = "https://github.com/po5/chapterskip" 50src.git = "https://github.com/po5/chapterskip"
51fetch.github = "po5/chapterskip" \ No newline at end of file 51fetch.github = "po5/chapterskip"
52
53[lesspipe]
54src.github = "wofr06/lesspipe"
55src.prefix = "v"
56fetch.url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v$ver.tar.gz" \ No newline at end of file
diff --git a/overlays/lesspipe.nix b/overlays/lesspipe.nix
new file mode 100644
index 00000000..70684241
--- /dev/null
+++ b/overlays/lesspipe.nix
@@ -0,0 +1,23 @@
1{ final, prev, sources, ... }: {
2 lesspipe = final.stdenv.mkDerivation {
3 pname = "lesspipe";
4 inherit (sources.lesspipe) version src;
5
6 nativeBuildInputs = with final; [ perl ];
7 buildInputs = with final; [ perl zsh makeWrapper ];
8 strictDeps = true;
9 configureFlags = [ "--shell=${final.zsh}/bin/zsh" "--yes" "--prefix=/" ];
10 makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ];
11 configurePlatforms = [];
12 dontBuild = true;
13
14 preConfigure = ''
15 patchShebangs --build configure
16 '';
17
18 preFixup = ''
19 wrapProgram $out/bin/lesspipe.sh \
20 --prefix PATH : ${final.python3.pkgs.pygments}:${final.file}/bin/file:${final.ncurses}/bin/tput
21 '';
22 };
23}
diff --git a/system-profiles/core.nix b/system-profiles/core.nix
index 87dc0e92..e6c0e085 100644
--- a/system-profiles/core.nix
+++ b/system-profiles/core.nix
@@ -86,7 +86,7 @@ in {
86 86
87 home-manager = { 87 home-manager = {
88 useGlobalPkgs = true; # Otherwise home-manager would only work impurely 88 useGlobalPkgs = true; # Otherwise home-manager would only work impurely
89 useUserPackages = true; 89 useUserPackages = false;
90 }; 90 };
91 91
92 sops = lib.mkIf hasSops { 92 sops = lib.mkIf hasSops {
diff --git a/user-profiles/utils.nix b/user-profiles/utils.nix
index 2e8a22f7..a1d7aa62 100644
--- a/user-profiles/utils.nix
+++ b/user-profiles/utils.nix
@@ -14,6 +14,10 @@
14 jq.enable = true; 14 jq.enable = true;
15 }; 15 };
16 16
17 home.sessionVariables = {
18 LESSCOLORIZER = "pygmentize -O style=solarized-dark";
19 };
20
17 home.packages = with pkgs; [ 21 home.packages = with pkgs; [
18 autossh usbutils pciutils exa silver-searcher pwgen unzip 22 autossh usbutils pciutils exa silver-searcher pwgen unzip
19 magic-wormhole qrencode tty-clock dnsutils openssl sshfs psmisc 23 magic-wormhole qrencode tty-clock dnsutils openssl sshfs psmisc