Compare commits

..

No commits in common. "e5b82f09025dd43adf0ff24d1e4af77a0e161af3" and "56dcf94ba02255bce9fca42b444cd67278fdf5ef" have entirely different histories.

10 changed files with 48 additions and 79 deletions

View file

@ -21,22 +21,6 @@
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1650374568,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"futils": {
"locked": {
"lastModified": 1653893745,
@ -55,22 +39,16 @@
},
"home-manager": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [
"nixpkgs"
],
"nmd": "nmd",
"nmt": "nmt",
"utils": [
"futils"
]
},
"locked": {
"lastModified": 1655858799,
"narHash": "sha256-Ws6BKlVuEVO29Ab3OEUfVLbWTECv/5Ax3yOMq/UeY0E=",
"lastModified": 1653943687,
"narHash": "sha256-xXW9t24HLf89+n/92kOqRRfOBE3KDna+9rAOefs5WSQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "06bb67ab24bd6e6c6d2bc97ecbcddd6c8b07ac18",
"rev": "8f3e26705178cc8c1d982d37d881fc0d5b5b1837",
"type": "github"
},
"original": {
@ -82,11 +60,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1655624069,
"narHash": "sha256-7g1zwTdp35GMTERnSzZMWJ7PG3QdDE8VOX3WsnOkAtM=",
"lastModified": 1653845079,
"narHash": "sha256-7ghaQZ+7JXLI9FgNH8+RQHAt3/ubT92j8NtjZleP6t4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0d68d7c857fe301d49cdcd56130e0beea4ecd5aa",
"rev": "b62ada430501de88dfbb08cea4eb98ead3a5e3e7",
"type": "github"
},
"original": {
@ -96,45 +74,13 @@
"type": "github"
}
},
"nmd": {
"flake": false,
"locked": {
"lastModified": 1653339422,
"narHash": "sha256-RNLq09vfj21TyYuUCeD6BNTNC6Ew8bLhQULZytN4Xx8=",
"owner": "rycee",
"repo": "nmd",
"rev": "91dee681dd1c478d6040a00835d73c0f4a4c5c29",
"type": "gitlab"
},
"original": {
"owner": "rycee",
"repo": "nmd",
"type": "gitlab"
}
},
"nmt": {
"flake": false,
"locked": {
"lastModified": 1648075362,
"narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
"owner": "rycee",
"repo": "nmt",
"rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
"type": "gitlab"
},
"original": {
"owner": "rycee",
"repo": "nmt",
"type": "gitlab"
}
},
"nur": {
"locked": {
"lastModified": 1655884594,
"narHash": "sha256-ZwmYvED9P9RmMvQkV+PeZ5vGQyDDaR5y8A5vuRnrac0=",
"lastModified": 1653970042,
"narHash": "sha256-EcphYipFvqkFV9PrWUUz034G7WQHZwYVwzGiyU5384A=",
"owner": "nix-community",
"repo": "NUR",
"rev": "4a38042992499ce141a38e7dc5a105c31fd77b98",
"rev": "83f9a7c7287210b20da844b1ccd7c79cb696f51e",
"type": "github"
},
"original": {

View file

@ -25,7 +25,6 @@
ref = "master";
inputs = {
nixpkgs.follows = "nixpkgs";
utils.follows = "futils";
};
};
@ -69,6 +68,7 @@
inherit (futils.lib) eachSystem system;
mySystems = [
system.aarch64-darwin
system.aarch64-linux
system.x86_64-darwin
system.x86_64-linux

View file

@ -15,4 +15,6 @@ let
mapModules ./. (file: import file { inherit self lib pkgs inputs; })
);
in
mylib.extend (self: super: foldr (a: b: a // b) { } (attrValues super))
mylib.extend (self: super:
foldr (a: b: a // b) { } (attrValues super)
)

View file

@ -1,4 +1,4 @@
{ lib, bitwarden-cli, coreutils, jq, keyutils, makeWrapper, rofi, stdenvNoCC }:
{ lib, bitwarden-cli, coreutils, jq, keyutils, makeWrapper, rofi, shellcheck, stdenvNoCC }:
stdenvNoCC.mkDerivation rec {
pname = "bw-pass";
version = "0.1.0";
@ -7,11 +7,14 @@ stdenvNoCC.mkDerivation rec {
buildInputs = [
makeWrapper
shellcheck
];
dontUnpack = true;
dontBuild = true;
buildPhase = ''
shellcheck $src
'';
installPhase = ''
mkdir -p $out/bin

View file

@ -1,4 +1,4 @@
{ lib, libnotify, makeWrapper, pamixer, stdenvNoCC }:
{ lib, libnotify, makeWrapper, pamixer, shellcheck, stdenvNoCC }:
stdenvNoCC.mkDerivation rec {
pname = "change-audio";
version = "0.3.0";
@ -7,11 +7,14 @@ stdenvNoCC.mkDerivation rec {
buildInputs = [
makeWrapper
shellcheck
];
dontUnpack = true;
dontBuild = true;
buildPhase = ''
shellcheck $src
'';
installPhase = ''
mkdir -p $out/bin

View file

@ -1,4 +1,4 @@
{ lib, brightnessctl, libnotify, makeWrapper, stdenvNoCC }:
{ lib, brightnessctl, libnotify, makeWrapper, shellcheck, stdenvNoCC }:
stdenvNoCC.mkDerivation rec {
pname = "change-backlight";
version = "0.1.0";
@ -7,11 +7,14 @@ stdenvNoCC.mkDerivation rec {
buildInputs = [
makeWrapper
shellcheck
];
dontUnpack = true;
dontBuild = true;
buildPhase = ''
shellcheck $src
'';
installPhase = ''
mkdir -p $out/bin

View file

@ -1,4 +1,4 @@
{ lib, fzf, makeWrapper, nix-index, stdenvNoCC }:
{ lib, fzf, makeWrapper, nix-index, shellcheck, stdenvNoCC }:
stdenvNoCC.mkDerivation rec {
pname = "comma";
version = "0.1.0";
@ -7,11 +7,14 @@ stdenvNoCC.mkDerivation rec {
buildInputs = [
makeWrapper
shellcheck
];
dontUnpack = true;
dontBuild = true;
buildPhase = ''
shellcheck $src
'';
installPhase = ''
mkdir -p $out/bin

View file

@ -1,4 +1,4 @@
{ lib, coreutils, git, gnused, makeWrapper, stdenvNoCC }:
{ lib, coreutils, git, gnused, makeWrapper, shellcheck, stdenvNoCC }:
stdenvNoCC.mkDerivation rec {
pname = "diff-flake";
version = "0.2.0";
@ -7,11 +7,14 @@ stdenvNoCC.mkDerivation rec {
buildInputs = [
makeWrapper
shellcheck
];
dontUnpack = true;
dontBuild = true;
buildPhase = ''
shellcheck $src
'';
installPhase = ''
mkdir -p $out/bin

View file

@ -1,4 +1,4 @@
{ lib, makeWrapper, openssh, rsync, sshpass, stdenvNoCC }:
{ lib, makeWrapper, openssh, rsync, shellcheck, sshpass, stdenvNoCC }:
stdenvNoCC.mkDerivation rec {
pname = "drone-rsync";
version = "0.1.0";
@ -7,11 +7,14 @@ stdenvNoCC.mkDerivation rec {
buildInputs = [
makeWrapper
shellcheck
];
dontUnpack = true;
dontBuild = true;
buildPhase = ''
shellcheck $src
'';
installPhase = ''
mkdir -p $out/bin

View file

@ -1,4 +1,4 @@
{ lib, coreutils, gnused, makeWrapper, stdenvNoCC, xorg }:
{ lib, coreutils, gnused, makeWrapper, shellcheck, stdenvNoCC, xorg }:
stdenvNoCC.mkDerivation rec {
pname = "i3-get-window-criteria";
version = "0.1.0";
@ -7,11 +7,14 @@ stdenvNoCC.mkDerivation rec {
buildInputs = [
makeWrapper
shellcheck
];
dontUnpack = true;
dontBuild = true;
buildPhase = ''
shellcheck $src
'';
installPhase = ''
mkdir -p $out/bin