From a0d460ca409601abded7a054e47e30a6caac8ab3 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Thu, 29 Dec 2022 13:35:15 +0100
Subject: [PATCH] Flake cleanup

---
 flake.nix                     | 14 +++++++-------
 nixos_modules/distributed.nix |  6 ++++++
 odin/hm.nix                   |  2 +-
 thor/hm.nix                   |  1 -
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/flake.nix b/flake.nix
index 599d224..cef1a9d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -148,7 +148,7 @@
 
       thorConfig = {
         nixosConfigurations = {
-          thor = nixpkgs.lib.nixosSystem rec {
+          thor = nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
             modules = commonModules ++ [
               { nixpkgs.config = config // { cudaSupport = true; }; }
@@ -189,7 +189,7 @@
             ];
           in
           rec {
-            odin-nvidia = nixpkgs.lib.nixosSystem rec {
+            odin-nvidia = nixpkgs.lib.nixosSystem {
               system = "x86_64-linux";
               modules = commonModules ++ odinCommonModules ++ [
                 { nixpkgs.config = config // { cudaSupport = true; }; }
@@ -197,7 +197,7 @@
               ];
             };
 
-            odin-intel = nixpkgs.lib.nixosSystem rec {
+            odin-intel = nixpkgs.lib.nixosSystem {
               system = "x86_64-linux";
               modules = commonModules ++ odinCommonModules ++ [
                 ./odin/configuration-intel.nix
@@ -223,8 +223,8 @@
       # };
 
       baldurConfig = {
-        nixosConfigurations = rec {
-          baldur = nixpkgs.lib.nixosSystem rec {
+        nixosConfigurations = {
+          baldur = nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
             modules = commonModules ++ [
               ./baldur/hardware-configuration.nix
@@ -237,8 +237,8 @@
       };
 
       lokiConfig = {
-        nixosConfigurations = rec {
-          loki = nixpkgs.lib.nixosSystem rec {
+        nixosConfigurations = {
+          loki = nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
             modules = commonModules ++ [
               nixos-hardware.nixosModules.common-cpu-intel
diff --git a/nixos_modules/distributed.nix b/nixos_modules/distributed.nix
index 884ae06..ed0175e 100644
--- a/nixos_modules/distributed.nix
+++ b/nixos_modules/distributed.nix
@@ -5,5 +5,11 @@
       "odin:ClRXzxmDZl2Y94SG4YlWXGiJDY4L9DgZq/3OLR5+i6k="
       "loki:HN1P2nXzIkqitl95MvjcSHxtDo7Ao+I8M8U/RqQLC5k="
     ];
+
+    # substituters = [
+    #   "ssh-ng://thor.local"
+    #   "ssh-ng://odin.local"
+    #   "ssh-ng://loki.local"
+    # ];
   };
 }
diff --git a/odin/hm.nix b/odin/hm.nix
index 6cc65bd..34c1342 100644
--- a/odin/hm.nix
+++ b/odin/hm.nix
@@ -40,7 +40,6 @@
       krita
       # lutris
       meld
-      mendeley
       # minecraft
       # mycrypto
       openvpn
@@ -135,6 +134,7 @@
     ../hm_modules/polybar.nix
     # ../hm_modules/pro_audio.nix
     # ../hm_modules/pycharm.nix
+    ../hm_modules/research.nix
     ../hm_modules/rofi.nix
     # ../hm_modules/screen_locker.nix
     # ../hm_modules/security.nix
diff --git a/thor/hm.nix b/thor/hm.nix
index 54aa74b..d361856 100644
--- a/thor/hm.nix
+++ b/thor/hm.nix
@@ -43,7 +43,6 @@
       krita
       # lutris
       meld
-      mendeley
       # minecraft
       # mycrypto
       openvpn