This commit is contained in:
Alexander Bantyev 2021-06-17 22:39:12 +03:00
parent e9b90eb33b
commit dd159754ae
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
5 changed files with 82 additions and 24 deletions

View File

@ -181,6 +181,21 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"locked": {
"lastModified": 1620759905,
"narHash": "sha256-WiyWawrgmyN0EdmiHyG2V+fqReiVi8bM9cRdMaKQOFg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b543720b25df6ffdfcf9227afafc5b8c1fabfae8",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"haskell-nix": { "haskell-nix": {
"locked": { "locked": {
"lastModified": 1587989559, "lastModified": 1587989559,
@ -342,6 +357,25 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nix-direnv": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1623578147,
"narHash": "sha256-tv7LT18lQCHFkld27JNFThJ55mnWIs/9/gAHXe4fcnA=",
"owner": "nix-community",
"repo": "nix-direnv",
"rev": "4eab19bf22d83395d80b02aed887a24c1cef9ae3",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-direnv",
"type": "github"
}
},
"nixos-fhs-compat": { "nixos-fhs-compat": {
"locked": { "locked": {
"lastModified": 1588706047, "lastModified": 1588706047,
@ -406,6 +440,21 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_10": {
"locked": {
"lastModified": 1587390417,
"narHash": "sha256-dLQebnBviLNiN2Ei3Iqyxm73EFwz77YcvitvMYwRNA8=",
"owner": "serokell",
"repo": "nixpkgs",
"rev": "6951747f4f4e9e27580150eb91587af94e41640d",
"type": "github"
},
"original": {
"owner": "serokell",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1617636226, "lastModified": 1617636226,
@ -482,6 +531,22 @@
} }
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": {
"lastModified": 1622059058,
"narHash": "sha256-t1/ZMtyxClVSfcV4Pt5C1YpkeJ/UwFF3oitLD7Ch/UA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "84aa23742f6c72501f9cc209f29c438766f5352d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1623580589, "lastModified": 1623580589,
"narHash": "sha256-Ayp1cjXpwFCkAiWUE46rj9APTltsiEBdIs2+cj+U7+c=", "narHash": "sha256-Ayp1cjXpwFCkAiWUE46rj9APTltsiEBdIs2+cj+U7+c=",
@ -497,7 +562,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1599773960, "lastModified": 1599773960,
"narHash": "sha256-5bL52aaUOOyOBjgKh9/6jQlFbeE+WfVX7dpvjohmD+w=", "narHash": "sha256-5bL52aaUOOyOBjgKh9/6jQlFbeE+WfVX7dpvjohmD+w=",
@ -512,21 +577,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_9": {
"locked": {
"lastModified": 1587390417,
"narHash": "sha256-dLQebnBviLNiN2Ei3Iqyxm73EFwz77YcvitvMYwRNA8=",
"owner": "serokell",
"repo": "nixpkgs",
"rev": "6951747f4f4e9e27580150eb91587af94e41640d",
"type": "github"
},
"original": {
"owner": "serokell",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"NUR": "NUR", "NUR": "NUR",
@ -541,8 +591,9 @@
"lambda-launcher": "lambda-launcher", "lambda-launcher": "lambda-launcher",
"materia-theme": "materia-theme", "materia-theme": "materia-theme",
"nix": "nix", "nix": "nix",
"nix-direnv": "nix-direnv",
"nixos-fhs-compat": "nixos-fhs-compat", "nixos-fhs-compat": "nixos-fhs-compat",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_8",
"nixpkgs-old": "nixpkgs-old", "nixpkgs-old": "nixpkgs-old",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"rycee": "rycee", "rycee": "rycee",
@ -606,7 +657,7 @@
"simple-osd-daemons": { "simple-osd-daemons": {
"inputs": { "inputs": {
"crate2nix": "crate2nix_2", "crate2nix": "crate2nix_2",
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1615418763, "lastModified": 1615418763,
@ -671,7 +722,7 @@
"yt-utilities": { "yt-utilities": {
"inputs": { "inputs": {
"haskell-nix": "haskell-nix", "haskell-nix": "haskell-nix",
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_10"
}, },
"locked": { "locked": {
"lastModified": 1588006875, "lastModified": 1588006875,

View File

@ -58,6 +58,10 @@
url = "gitlab:rycee/nur-expressions"; url = "gitlab:rycee/nur-expressions";
flake = false; flake = false;
}; };
nix-direnv = {
url = "github:nix-community/nix-direnv";
};
}; };
outputs = { nixpkgs, nix, self, deploy-rs, ... }@inputs: { outputs = { nixpkgs, nix, self, deploy-rs, ... }@inputs: {

View File

@ -13,7 +13,7 @@
in [ stateless-github-cli ]; in [ stateless-github-cli ];
xdg.configFile."gh/config.yaml".text = builtins.toJSON { xdg.configFile."gh/config.yaml".text = builtins.toJSON {
git_protocol = "https"; git_protocol = "ssh";
editor = ""; editor = "";
aliases = { aliases = {
pv = "pr view --comments"; pv = "pr view --comments";

View File

@ -85,11 +85,11 @@ in {
inherit (nur.balsoft.pkgs) termNote nix-patch; inherit (nur.balsoft.pkgs) termNote nix-patch;
lambda-launcher = inputs.lambda-launcher.defaultPackage.x86_64-linux; lambda-launcher = inputs.lambda-launcher.defaultPackage.${system};
simple-osd = inputs.simple-osd-daemons.packages.x86_64-linux; simple-osd = inputs.simple-osd-daemons.packages.${system};
yt-utilities = inputs.yt-utilities.defaultPackage.x86_64-linux; yt-utilities = inputs.yt-utilities.defaultPackage.${system};
nerdfonts = nur.balsoft.pkgs.roboto-mono-nerd; nerdfonts = nur.balsoft.pkgs.roboto-mono-nerd;
@ -104,6 +104,8 @@ in {
# patchShebangs man/fix-roff-punct # patchShebangs man/fix-roff-punct
# ''; # '';
# }); # });
nix-direnv = inputs.nix-direnv.defaultPackage.${system};
}) })
]; ];
nixpkgs.config = { nixpkgs.config = {

View File

@ -1,10 +1,11 @@
{ config, pkgs, lib, ... }: { { config, pkgs, lib, inputs, ... }: {
home-manager.users.balsoft = { home-manager.users.balsoft = {
programs.direnv = { programs.direnv = {
enable = true; enable = true;
nix-direnv = { nix-direnv = {
enable = true; enable = true;
enableFlakes = true; enableFlakes = true;
# package = inputs.nix-direnv.defaultPackage.${pkgs.system};
}; };
}; };
}; };