fix(retiolum): depend on palos retiolum again

.versions/nixpkgs.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs.git",
-  "rev": "65c9cc79f1d179713c227bf447fb0dac384cdcda",
+  "rev": "647cc06986c1ae4a2bb05298e0cf598723e42970",
-  "date": "2020-12-09T20:51:49+01:00",
+  "date": "2020-12-15T20:08:24+00:00",
-  "path": "/nix/store/135wrlz0d26415l2zqa1xs7k7lvgd0ik-nixpkgs",
+  "path": "/nix/store/afk74xw4k06mddcnx40cnmklh8163pfl-nixpkgs",
-  "sha256": "0whxlm098vas4ngq6hm3xa4mdd2yblxcl5x5ny216zajp08yp1wf",
+  "sha256": "1n1sd5lbds08vxy8x9l94w0z8bbq39fh2rrr6mnq0rmhf4xb2mj1",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false

.versions/retiolum.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/krebs/retiolum",
-  "rev": "eeae0bd599c196456c4edba7018efb50ebcef456",
+  "rev": "98b12bc8da8b93caa3488c4b515c131cfc16a158",
-  "date": "2020-11-24T11:02:11+01:00",
+  "date": "2020-12-16T20:32:13+01:00",
-  "path": "/nix/store/g0yibifm9zy2405m5xi8dlvaljac5s2c-retiolum",
+  "path": "/nix/store/70n7a8psniindhb1z09513m64gaiyrww-retiolum",
-  "sha256": "15s613vv6wwdc95mybx85cqp0mb6jkpr3dsada41idm3yhk4x0rx",
+  "sha256": "1siggb36dgrm7prv47691k3wx3mcpx2n4jyqrzsk2jhr9kayxcjd",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false

configs/neovim.nix

@@ -20,6 +20,7 @@
   };
 
   environment.systemPackages = [
+    (pkgs.writers.writeDashBin "vim" ''neovim "$@"'')
     (pkgs.neovim.override {
       configure = {
         customRC = builtins.readFile <niveum/lib/vim/init.vim>;

configs/packages/default.nix

@@ -47,7 +47,7 @@ in {
     # mtr # my traceroute
     # FILE MANAGERS
     ranger
-    gnome3.nautilus
+    pcmanfm
     # MEDIA
     ffmpeg
     imagemagick

configs/spotifyd.nix

@@ -9,4 +9,6 @@
       };
     };
   };
+
+  systemd.services.spotifyd.serviceConfig.Restart = "always";
 }

modules/retiolum.nix

@@ -1,16 +1,6 @@
 { config, pkgs, lib, ... }:
 with lib;
 let
-  stockholm-systems =
-  let systemsDir = <stockholm> + "/krebs/1systems";
-   in genAttrs
-     (attrNames (filterAttrs (_: value: value == "directory") (builtins.readDir systemsDir)))
-     (name: import <nixpkgs/nixos> {
-       configuration = import (systemsDir + "/${name}/config.nix");
-     });
-
-  hostsPackage = stockholm-systems.filebitch.config.krebs.tinc.retiolum.hostsPackage;
-
   netname = "retiolum";
   cfg = config.networking.retiolum;
 in {
@@ -50,10 +40,7 @@ in {
 
     systemd.services."tinc.${netname}" = {
       preStart = ''
-        set -eu
+        cp -R ${toString <retiolum/hosts>} /etc/tinc/retiolum/ || true
-
-        mkdir -p /etc/tinc/${netname}/hosts/
-        cp ${hostsPackage}/* /etc/tinc/${netname}/hosts/
       '';
 
       # Some hosts require VPN for nixos-rebuild, so we don't want to restart it on update
@@ -62,9 +49,7 @@ in {
       serviceConfig.ExecReload = "${config.services.tinc.networks.${netname}.package}/bin/tinc -n ${netname} reload";
     };
 
-    networking.extraHosts =
+    networking.extraHosts = builtins.readFile (toString <retiolum/etc.hosts>);
-      # TODO generate from stockholm
-      builtins.readFile (toString <retiolum/etc.hosts>);
 
     environment.systemPackages =
       [ config.services.tinc.networks.${netname}.package ];