From 6bfae52a33131069b4499b9c2c4b7e446502dfb1 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Sat, 5 Oct 2019 00:28:36 +0200 Subject: [PATCH] Rename file packages to kebab-case --- default.nix | 12 ++++++------ src/pkgs/bootstrap.nix | 8 ++++---- src/pkgs/files/default.nix | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/default.nix b/default.nix index 4e90fed..d26522f 100644 --- a/default.nix +++ b/default.nix @@ -22,13 +22,13 @@ in nixpkgs.coreutils nixpkgs.nix # pkgs.proot - pkgs.files.hmInstall - pkgs.files.homeNixDefault + pkgs.files.hm-install + pkgs.files.home-nix-default pkgs.files.login - pkgs.files.loginInner - pkgs.files.nixConf - pkgs.files.nixOnDroidLinker - pkgs.files.resolvConf + pkgs.files.login-inner + pkgs.files.nix-conf + pkgs.files.nix-on-droid-linker + pkgs.files.resolv-conf ]; }; } // pkgs.files diff --git a/src/pkgs/bootstrap.nix b/src/pkgs/bootstrap.nix index ce74391..aecfddb 100644 --- a/src/pkgs/bootstrap.nix +++ b/src/pkgs/bootstrap.nix @@ -20,11 +20,11 @@ buildPkgs.runCommand "bootstrap" { } '' install -D -m 0755 ${proot}/bin/proot $out/bin/proot cp ${files.login}/bin/login $out/bin/login - cp ${files.loginInner}/bin/login-inner $out/bin/login-inner + cp ${files.login-inner}/bin/login-inner $out/bin/login-inner - cp ${files.homeNixDefault}/etc/home.nix.default $out/etc/home.nix.default - cp ${files.nixConf}/etc/nix/nix.conf $out/etc/nix/nix.conf - cp ${files.resolvConf}/etc/resolv.conf $out/etc/resolv.conf + cp ${files.home-nix-default}/etc/home.nix.default $out/etc/home.nix.default + cp ${files.nix-conf}/etc/nix/nix.conf $out/etc/nix/nix.conf + cp ${files.resolv-conf}/etc/resolv.conf $out/etc/resolv.conf find $out -executable -type f | sed s@^$out/@@ > $out/EXECUTABLES.txt diff --git a/src/pkgs/files/default.nix b/src/pkgs/files/default.nix index d443946..1f764c6 100644 --- a/src/pkgs/files/default.nix +++ b/src/pkgs/files/default.nix @@ -21,23 +21,23 @@ let in { - hmInstall = callPackage ./hm-install.nix { }; + hm-install = callPackage ./hm-install.nix { }; - homeNixDefault = writeTextDir "etc/home.nix.default" (builtins.readFile ./raw/home.nix.default); + home-nix-default = writeTextDir "etc/home.nix.default" (builtins.readFile ./raw/home.nix.default); login = callPackage ./login.nix { }; - loginInner = callPackage ./login-inner.nix { }; + login-inner = callPackage ./login-inner.nix { }; - nixConf = writeTextDir "etc/nix/nix.conf" '' + nix-conf = writeTextDir "etc/nix/nix.conf" '' sandbox = false substituters = https://cache.nixos.org https://nix-on-droid.cachix.org trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-on-droid.cachix.org-1:56snoMJTXmDRC1Ei24CmKoUqvHJ9XCp+nidK7qkMQrU= ''; - nixOnDroidLinker = callPackage ./nix-on-droid-linker.nix { }; + nix-on-droid-linker = callPackage ./nix-on-droid-linker.nix { }; - resolvConf = writeTextDir "etc/resolv.conf" '' + resolv-conf = writeTextDir "etc/resolv.conf" '' nameserver 1.1.1.1 nameserver 8.8.8.8 '';