diff options
| -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-- | lass/1systems/cloudkrebs.nix | 12 | ||||
| -rw-r--r-- | lass/2configs/fastpoke-pages.nix | 2 | ||||
| -rw-r--r-- | tv/2configs/base.nix | 2 |
6 files changed, 8 insertions, 20 deletions
diff --git a/0make/lass/cloudkrebs.makefile b/0make/lass/cloudkrebs.makefile deleted file mode 100644 index baf7660b4..000000000 --- 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 896466a6f..000000000 --- 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 9762e8ed4..000000000 --- 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/lass/1systems/cloudkrebs.nix b/lass/1systems/cloudkrebs.nix index a60024b03..515810e44 100644 --- a/lass/1systems/cloudkrebs.nix +++ b/lass/1systems/cloudkrebs.nix @@ -2,12 +2,12 @@ { imports = [ - ../../2configs/tv/CAC-Developer-2.nix - ../../2configs/tv/CAC-CentOS-7-64bit.nix - ../../2configs/lass/base.nix - ../../2configs/lass/retiolum.nix - ../../2configs/lass/fastpoke-pages.nix - ../../2configs/lass/new-repos.nix + ../../tv/2configs/CAC-Developer-2.nix + ../../tv/2configs/CAC-CentOS-7-64bit.nix + ../2configs/base.nix + ../2configs/retiolum.nix + ../2configs/fastpoke-pages.nix + ../2configs/new-repos.nix { networking.interfaces.enp2s1.ip4 = [ { diff --git a/lass/2configs/fastpoke-pages.nix b/lass/2configs/fastpoke-pages.nix index 74e92ccc3..1f997eb6a 100644 --- a/lass/2configs/fastpoke-pages.nix +++ b/lass/2configs/fastpoke-pages.nix @@ -23,7 +23,7 @@ let in { imports = [ - ../../3modules/lass/iptables.nix + ../3modules/iptables.nix ] ++ map createStaticPage [ "habsys.de" "pixelpocket.de" diff --git a/tv/2configs/base.nix b/tv/2configs/base.nix index 997d4c235..89a66115a 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"; |