Compare commits

...

3 Commits

Author SHA1 Message Date
Giulio De Pasquale
96fb40da39 Merge branch 'master' of ssh://git.giugl.io/peperunas/nixos 2023-03-27 17:49:33 +02:00
Giulio De Pasquale
48be921be6 Update lock 2023-03-27 17:49:17 +02:00
Giulio De Pasquale
6b0e3567be zsh: Remove _nr function 2023-03-27 17:48:21 +02:00
2 changed files with 10 additions and 37 deletions

18
flake.lock generated
View File

@ -8,11 +8,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1679067101, "lastModified": 1679738842,
"narHash": "sha256-tMI1inGT9u4KWQml0w30dhWqQPlth1e9K/68sfDkEQA=", "narHash": "sha256-CvqRbsyDW756EskojZptDU590rez29RcHDV3ezoze08=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9154cd519a8942728038819682d6b3ff33f321bb", "rev": "83110c259889230b324bb2d35bef78bf5f214a1f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -24,11 +24,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1679501548, "lastModified": 1679931591,
"narHash": "sha256-uyf2M+jM/yppl2kMFInwF/q0MqOyUYu6vV7SrmcCq0A=", "narHash": "sha256-P7QF32p/SzMIqmjRfo5Qdii500dl9BeOY+iG1KgNQJo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7b67f786c9f75c3dfdd189a2387b787b79390919", "rev": "d388bd7db41b9f4f62d434e9cb0a5fe3f2fd8b6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -40,11 +40,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1679318992, "lastModified": 1679748960,
"narHash": "sha256-uoj5Oy6hruIHuxzfQZtcalObe5kPrX9v+ClUMFEOzmE=", "narHash": "sha256-BP8XcYHyj1NxQi04RpyNW8e7KiXSoI+Fy1tXIK2GfdA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e2c97799da5f5cd87adfa5017fba971771e123ef", "rev": "da26ae9f6ce2c9ab380c0f394488892616fc5a6a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -1,4 +1,4 @@
{ config, pkgs, lib, optionalString, ... }: { config, pkgs, lib, ... }:
let let
inherit (pkgs.lib) optionalString; inherit (pkgs.lib) optionalString;
@ -12,28 +12,6 @@ let
exec ${pkgs.zsh}/bin/zsh exec ${pkgs.zsh}/bin/zsh
''; '';
nix_run_fn = ''
function _nr {
if [ "$#" -lt 1 ]; then
echo "Usage: _nr <pkg>"
return
fi
quoted_args=()
local pkg=$1
shift 1
for a in "$@"; do
quoted_args+=("\"$a\"")
done
echo ''${quoted_args[@]}
# `nix run nixpkgs#$pkg -- ''${quoted_args[@]}`
exec nix run nixpkgs#$pkg "$@"
}
'';
in in
{ {
programs.zsh = { programs.zsh = {
@ -47,11 +25,6 @@ in
}; };
home.file.".bashrc".text = '' home.file.".bashrc".text = ''
${nix_run_fn}
${optionalString (!builtins.hasAttr "users" config) "${exec_zsh}"} ${optionalString (!builtins.hasAttr "users" config) "${exec_zsh}"}
''; '';
home.file.".zshrc".text = nix_run_fn;
} }