diff options
| author | makefu <github@syntax-fehler.de> | 2015-08-04 15:21:38 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-08-04 15:21:38 +0200 |
| commit | 8549987eef609d754634cc9347921230fcd7df98 (patch) | |
| tree | 33ce45d21172afecbb751813322251ca1e151321 | |
| parent | 1e1a8b1d433747a72eb847d918153c15aaf3add5 (diff) | |
| parent | 64ca0a26f185be7077eb3772f7b96a31ddc2f4fa (diff) | |
Merge remote-tracking branch 'cloudkrebs/master'
| -rw-r--r-- | 0make/lass/cloudkrebs.makefile | 4 | ||||
| -rw-r--r-- | 0make/lass/mors.makefile | 4 | ||||
| -rw-r--r-- | 0make/lass/uriel.makefile | 4 | ||||
| -rw-r--r-- | tv/2configs/base.nix | 2 |
4 files changed, 1 insertions, 13 deletions
diff --git a/0make/lass/cloudkrebs.makefile b/0make/lass/cloudkrebs.makefile deleted file mode 100644 index baf7660..0000000 --- a/0make/lass/cloudkrebs.makefile +++ /dev/null @@ -1,4 +0,0 @@ -deploy_host := root@cloudkrebs -nixpkgs_url := https://github.com/Lassulus/nixpkgs -nixpkgs_rev := 1879a011925c561f0a7fd4043da0768bbff41d0b -secrets_dir := /home/lass/secrets/cloudkrebs diff --git a/0make/lass/mors.makefile b/0make/lass/mors.makefile deleted file mode 100644 index 896466a..0000000 --- a/0make/lass/mors.makefile +++ /dev/null @@ -1,4 +0,0 @@ -deploy_host := root@mors -nixpkgs_url := https://github.com/Lassulus/nixpkgs -nixpkgs_rev := 1879a011925c561f0a7fd4043da0768bbff41d0b -secrets_dir := /home/lass/secrets/mors diff --git a/0make/lass/uriel.makefile b/0make/lass/uriel.makefile deleted file mode 100644 index 9762e8e..0000000 --- a/0make/lass/uriel.makefile +++ /dev/null @@ -1,4 +0,0 @@ -deploy_host := root@uriel -nixpkgs_url := https://github.com/Lassulus/nixpkgs -nixpkgs_rev := 961fcbabd7643171ea74bd550fee1ce5c13c2e90 -secrets_dir := /home/lass/secrets/uriel diff --git a/tv/2configs/base.nix b/tv/2configs/base.nix index 997d4c2..89a6611 100644 --- a/tv/2configs/base.nix +++ b/tv/2configs/base.nix @@ -90,7 +90,7 @@ in rxvt_unicode.terminfo ]; - environment.shellAliases = { + environment.shellAliases = mkForce { # alias cal='cal -m3' gp = "${pkgs.pari}/bin/gp -q"; df = "df -h"; |