summary refs log tree commit diff
diff options
context:
space:
mode:
authorEmma@Rory <root@rory.gay>2023-09-08 12:46:37 +0200
committerEmma@Rory <root@rory.gay>2023-09-08 12:46:46 +0200
commit8c36c1e74b71154cc20c78a55e3ad4b0d2f20031 (patch)
tree40a467759f9da463f020df20728e8c7f126f89ec
parentenable service (diff)
downloadRory-Open-Architecture-8c36c1e74b71154cc20c78a55e3ad4b0d2f20031.tar.xz
Successful build on RoryNix
-rwxr-xr-xflake.nix1
-rw-r--r--host/RoryNix/configuration.nix54
2 files changed, 30 insertions, 25 deletions
diff --git a/flake.nix b/flake.nix
index b8ef119..e504fa0 100755
--- a/flake.nix
+++ b/flake.nix
@@ -60,6 +60,7 @@
         modules = [
           ./host/RoryNix/configuration.nix
           ./hardware-configuration.nix
+          ({...}: { nix.registry.nixpkgs.flake = nixpkgs-RoryNix; })
         ];
       };
     };
diff --git a/host/RoryNix/configuration.nix b/host/RoryNix/configuration.nix
index 4db2d44..97030a3 100644
--- a/host/RoryNix/configuration.nix
+++ b/host/RoryNix/configuration.nix
@@ -97,7 +97,7 @@
     feh
     git
     #lsd
-    steam
+    #steam
     #nerdfonts
     #element-web
     sshfs
@@ -124,27 +124,27 @@
   fonts.fonts = with pkgs; [
     (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
   ];
-  nixpkgs.overlays = [
-    (self: super: {
-        python3 = super.python3.override {
-          packageOverrides = python-self: python-super: {
-            markdown-it-py = python-super.markdown-it-py.overrideAttrs (oldAttrs: {
-              doInstallCheck = false;
-            });
-          };
-        };
-        haskellPackages = super.haskellPackages.override {
-          overrides = haskellPackages-self: haskellPackages-super: {
-            basement = haskellPackages-super.basement.overrideAttrs (oldAttrs: {
-              patches = [
-                ./patches/haskell/basement/IntWord64.patch
-              ];
-            });
-          };
-        };
-      }
-    )
-  ];
+#  nixpkgs.overlays = [
+#    (self: super: {
+#        python3 = super.python3.override {
+#          packageOverrides = python-self: python-super: {
+#            markdown-it-py = python-super.markdown-it-py.overrideAttrs (oldAttrs: {
+#              doInstallCheck = false;
+#            });
+#          };
+#        };
+#        haskellPackages = super.haskellPackages.override {
+#          overrides = haskellPackages-self: haskellPackages-super: {
+#            basement = haskellPackages-super.basement.overrideAttrs (oldAttrs: {
+#              patches = [
+#                ./patches/haskell/basement/IntWord64.patch
+#              ];
+#            });
+#          };
+#        };
+#      }
+#    )
+#  ];
   security.polkit.enable = true;
 
   nix = {
@@ -159,11 +159,15 @@
         hostName = "192.168.0.3";
         sshUser = "Rory";
         sshKey = "/home/Rory/.ssh/id_ed25519";
-        maxJobs = 12;
+        maxJobs = 6;
+        #cores = 2;
+        speedFactor = 43200;
       }
     ];
-    registry.nixpkgs.flake = pkgs;
-    nixPath = "nixpkgs=flake:nixpkgs";
+    #buildersUseSubstitutes = true;
+    #ssh://Rory@192.168.0.3 x86_64-linux,i686-linux /home/Rory/.ssh/id_ed25519 12 1 - - -
+    #registry.nixpkgs.flake = pkgs;
+    nixPath = [ "nixpkgs=flake:nixpkgs" ];
   };
   
   system.stateVersion = "22.11"; # DO NOT EDIT!