From f8a041aca2c1a481740cbfd8e3d9bc8b68aa7075 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 24 Nov 2019 18:53:08 +0100
Subject: borg via btrfs on sif

---
 sif.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sif.nix')

diff --git a/sif.nix b/sif.nix
index 80018442..b56b0280 100644
--- a/sif.nix
+++ b/sif.nix
@@ -349,12 +349,12 @@
   '';
 
   services.borgbackup = {
-    snapshots = "lvm";
+    snapshots = "btrfs";
     prefix = "yggdrasil.midgard.sif.";
     targets = {
       "munin" = {
         repo = "borg.munin:borg";
-        paths = [ { VG = "nvm"; LV = "home"; } ];
+        paths = [ "/home/gkleen" ];
         prune = {
           "home" =
             [ "--keep-within" "24H"
-- 
cgit v1.2.3


From cbb3fd7cb1c705c43a70e59a614667f29a229bac Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 24 Nov 2019 21:41:32 +0100
Subject: optimus prime on sif

---
 sif.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'sif.nix')

diff --git a/sif.nix b/sif.nix
index b56b0280..5f193a54 100644
--- a/sif.nix
+++ b/sif.nix
@@ -97,6 +97,8 @@
       libinput.enable = true;
 
       dpi = 282;
+
+      videoDrivers = [ "intel" "nvidia" ];
     };
 
     yggdrasilTinc = {
@@ -293,10 +295,10 @@
 
     brightnessctl.enable = true;
 
-    bumblebee = {
+    nvidia.optimus_prime = {
       enable = true;
-      group = "video";
-      connectDisplay = true;
+      nvidiaBusId = "PCI:1:0:0";
+      intelBusId = "PCI:0:2:0";
     };
   };
 
-- 
cgit v1.2.3


From e68d21ffe53c3860b59b72410e0d763a6590f272 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 24 Nov 2019 22:05:55 +0100
Subject: nvidia on sif

---
 sif.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'sif.nix')

diff --git a/sif.nix b/sif.nix
index 5f193a54..36afeca2 100644
--- a/sif.nix
+++ b/sif.nix
@@ -295,10 +295,14 @@
 
     brightnessctl.enable = true;
 
-    nvidia.optimus_prime = {
-      enable = true;
-      nvidiaBusId = "PCI:1:0:0";
-      intelBusId = "PCI:0:2:0";
+    nvidia = {
+      modesetting.enable = true;
+      
+      optimus_prime = {
+        enable = true;
+        nvidiaBusId = "PCI:1:0:0";
+        intelBusId = "PCI:0:2:0";
+      };
     };
   };
 
-- 
cgit v1.2.3