home

commit 27d5499e6f8f4f56471ad8c896c84094545e0aba
parent 4b663504db1952f9e79c7ea9ca80427265d71489
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Fri, 14 Sep 2018 12:57:25 +0200

Move emacs-scripts to scripts…

… and add more scripts

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
base.nix
 | 
1
+
M
emacs.nix
 | 
1
-
M
overlays/sbr.nix
 | 
2
+-
M
pkgs/default.nix
 | 
2
+-
D
pkgs/emacs-scripts/builder.sh
 | 
4
----
D
pkgs/emacs-scripts/default.nix
 | 
7
-------
R
pkgs/emacs-scripts/ec -> pkgs/scripts/bin/ec
 | 
0

R
pkgs/emacs-scripts/eco -> pkgs/scripts/bin/eco
 | 
0

R
pkgs/emacs-scripts/et -> pkgs/scripts/bin/et
 | 
0

R
pkgs/emacs-scripts/eto -> pkgs/scripts/bin/eto
 | 
0

A
pkgs/scripts/bin/import-google-photo.sh
 | 
1
+
A
pkgs/scripts/builder.sh
 | 
4
++++
A
pkgs/scripts/default.nix
 | 
7
+++++++

13 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/base.nix b/base.nix
@@ -27,6 +27,7 @@ rec {
   xdg.configFile."tmux/tmux.conf".source = ./tmux/tmux.conf;
   xdg.configFile."tmux/commons/keybindings".source = ./tmux/keybindings;
   home.packages = with pkgs; [
+    scripts
     direnv
     enchive
     htop
diff --git a/emacs.nix b/emacs.nix
@@ -1,7 +1,6 @@
 { pkgs, config, lib, ... }:
 
 {
-  home.packages = with pkgs; [ emacs-scripts ];
   systemd.user.services.emacs = {
     Unit = {
       Description = "Emacs: the extensible, self-documenting text editor";
diff --git a/overlays/sbr.nix b/overlays/sbr.nix
@@ -6,7 +6,7 @@ self: super:
   dobi = import ../pkgs/dobi {
     inherit (super) stdenv lib buildGoPackage fetchFromGitHub;
   };
-  emacs-scripts = import ../pkgs/emacs-scripts {
+  scripts = import ../pkgs/scripts {
     inherit (super) stdenv;
   };
   envbox = import ../pkgs/envbox {
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -9,7 +9,7 @@ in rec {
   dobi = import ./dobi {
     inherit (pkgs) stdenv lib fetchFromGitHub buildGoPackage;
   };
-  emacs-scripts = import ./emacs-scripts {
+  scripts = import ./scripts {
     inherit (pkgs) stdenv;
   };
   envbox = import ./envbox {
diff --git a/pkgs/emacs-scripts/builder.sh b/pkgs/emacs-scripts/builder.sh
@@ -1,4 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out/bin
-cp $src/e* $out/bin/
diff --git a/pkgs/emacs-scripts/default.nix b/pkgs/emacs-scripts/default.nix
@@ -1,7 +0,0 @@
-{ stdenv }:
-
-stdenv.mkDerivation {
-  name = "emacs-scripts-0.2";
-  builder = ./builder.sh;
-  src = ./.;
-}
diff --git a/pkgs/emacs-scripts/ec b/pkgs/scripts/bin/ec
diff --git a/pkgs/emacs-scripts/eco b/pkgs/scripts/bin/eco
diff --git a/pkgs/emacs-scripts/et b/pkgs/scripts/bin/et
diff --git a/pkgs/emacs-scripts/eto b/pkgs/scripts/bin/eto
diff --git a/pkgs/scripts/bin/import-google-photo.sh b/pkgs/scripts/bin/import-google-photo.sh
@@ -0,0 +1 @@
+#!/usr/bin/env bash
diff --git a/pkgs/scripts/builder.sh b/pkgs/scripts/builder.sh
@@ -0,0 +1,4 @@
+source $stdenv/setup
+
+mkdir -p $out/bin
+cp $src/bin/* $out/bin/
diff --git a/pkgs/scripts/default.nix b/pkgs/scripts/default.nix
@@ -0,0 +1,7 @@
+{ stdenv }:
+
+stdenv.mkDerivation {
+  name = "vde-scripts-0.1";
+  builder = ./builder.sh;
+  src = ./.;
+}