crazedprogrammer: 4a0d2dc7bb -> 365fbdc5d0

nix-community · Dec 9, 2018 · 4f5ec5a · 4f5ec5a
1 parent 49fab9c
commit 4f5ec5a
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 5 deletions.
diff --git a/repos/crazedprogrammer/modules/home/hardware.nix b/repos/crazedprogrammer/modules/home/hardware.nix
@@ -3,7 +3,7 @@
 {
   boot = {
     # Boot select timeout of 1 second.
-    loader.timeout = 1;
+    loader.timeout = 0;
 
     # Quiet console at startup.
     kernelParams = [ "quiet" "vga=current" "libahci.ignore_sss=1" ];

diff --git a/repos/crazedprogrammer/modules/home/kernel/default.nix b/repos/crazedprogrammer/modules/home/kernel/default.nix
@@ -14,9 +14,6 @@ recurseIntoAttrs (linuxPackagesFor (linux.override {
 
       LEDS_TRIGGER_DISK = yes;
 
-      # We need this module early on, so compile it into the kernel image.
-      BTRFS_FS = yes;
-
       # Not using Nvidia cards, so don't compile the (expensive) modules.
       FB_NVIDIA_I2C = no;
       DRM_NOUVEAU = no;

diff --git a/repos/crazedprogrammer/modules/home/packages.nix b/repos/crazedprogrammer/modules/home/packages.nix
@@ -29,7 +29,7 @@
 
     # Languages
     ghc lua5_3 cargo gcc luajit openjdk ruby nodejs-8_x
-    sbcl ((import <nixos-unstable> {}).urn.override { useLuaJit = true; }) haskellPackages.idris
+    sbcl (urn.override { useLuaJit = true; }) haskellPackages.idris
 
     # Games
     multimc technic-launcher minetest gnome3.gnome-mines #dwarf-fortress

diff --git a/repos/crazedprogrammer/modules/hosts/helium.nix b/repos/crazedprogrammer/modules/hosts/helium.nix
@@ -41,6 +41,9 @@
       structuredExtraConfig = {
         MSKYLAKE = "y";
         SND_HDA_POWER_SAVE_DEFAULT = "1";
+
+        # We need this module early on, so compile it into the kernel image.
+        BTRFS_FS = yes;
       };
     });
   };

diff --git a/repos/crazedprogrammer/modules/hosts/xenon.nix b/repos/crazedprogrammer/modules/hosts/xenon.nix
@@ -17,6 +17,11 @@
   boot.kernelPackages = import ../home/kernel (pkgs // {
     structuredExtraConfig = {
       MZEN = "y";
+
+      # Don't need Btrfs on this system, saves ~200ms at boot time due to
+      # unnecessary raid6 benchmarks.
+      BTRFS_FS = "n";
+      BTRFS_FS_POSIX_ACL = null;
     };
   });
 

diff --git a/repos/crazedprogrammer/pkgs/overlays/overrides.nix b/repos/crazedprogrammer/pkgs/overlays/overrides.nix
@@ -9,6 +9,7 @@ self: super:
   emacs = import ../overrides/emacs.nix super;
   cli-visualizer = import ../overrides/cli-visualizer.nix super;
   multimc = import ../overrides/multimc.nix super;
+  urn = import ../overrides/urn.nix super;
   #sway = import ../overrides/sway.nix self super;
   #wlc = import ../overrides/wlc.nix super;
 }
diff --git a/repos/crazedprogrammer/pkgs/overrides/urn.nix b/repos/crazedprogrammer/pkgs/overrides/urn.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchFromGitLab, urn, ... }:
+
+urn.overrideDerivation (old: rec {
+  version = "0.7.2-pre";
+  name = "urn-${version}";
+  src = fetchFromGitLab {
+    owner = "urn";
+    repo = "urn";
+    rev = "ff1049713dcc7ded5968a813627543281e5f299f";
+    sha256 = "1kcrrdk3b6kljh0jk4s916l3f3ixfx2mdazr6mr9l2jsdcki7zxz";
+  };
+})