diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2019-12-01 18:12:46 +0100 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2019-12-01 18:12:46 +0100 |
| commit | fd4321d1597197aa2439dbabc6f9851dbf5f4b0a (patch) | |
| tree | eb4f282efb6e53a92af4b74ad1c69dd4ba354185 /sif.nix | |
| parent | ad4b568a9aea73c860421200a3f3869b52c4b809 (diff) | |
| parent | e68d21ffe53c3860b59b72410e0d763a6590f272 (diff) | |
| download | nixos-fd4321d1597197aa2439dbabc6f9851dbf5f4b0a.tar nixos-fd4321d1597197aa2439dbabc6f9851dbf5f4b0a.tar.gz nixos-fd4321d1597197aa2439dbabc6f9851dbf5f4b0a.tar.bz2 nixos-fd4321d1597197aa2439dbabc6f9851dbf5f4b0a.tar.xz nixos-fd4321d1597197aa2439dbabc6f9851dbf5f4b0a.zip | |
Merge branch 'master' of git.yggdrasil.li:nixos
Diffstat (limited to 'sif.nix')
| -rw-r--r-- | sif.nix | 18 |
1 files changed, 12 insertions, 6 deletions
| @@ -97,6 +97,8 @@ | |||
| 97 | libinput.enable = true; | 97 | libinput.enable = true; |
| 98 | 98 | ||
| 99 | dpi = 282; | 99 | dpi = 282; |
| 100 | |||
| 101 | videoDrivers = [ "intel" "nvidia" ]; | ||
| 100 | }; | 102 | }; |
| 101 | 103 | ||
| 102 | yggdrasilTinc = { | 104 | yggdrasilTinc = { |
| @@ -293,10 +295,14 @@ | |||
| 293 | 295 | ||
| 294 | brightnessctl.enable = true; | 296 | brightnessctl.enable = true; |
| 295 | 297 | ||
| 296 | bumblebee = { | 298 | nvidia = { |
| 297 | enable = true; | 299 | modesetting.enable = true; |
| 298 | group = "video"; | 300 | |
| 299 | connectDisplay = true; | 301 | optimus_prime = { |
| 302 | enable = true; | ||
| 303 | nvidiaBusId = "PCI:1:0:0"; | ||
| 304 | intelBusId = "PCI:0:2:0"; | ||
| 305 | }; | ||
| 300 | }; | 306 | }; |
| 301 | }; | 307 | }; |
| 302 | 308 | ||
| @@ -349,12 +355,12 @@ | |||
| 349 | ''; | 355 | ''; |
| 350 | 356 | ||
| 351 | services.borgbackup = { | 357 | services.borgbackup = { |
| 352 | snapshots = "lvm"; | 358 | snapshots = "btrfs"; |
| 353 | prefix = "yggdrasil.midgard.sif."; | 359 | prefix = "yggdrasil.midgard.sif."; |
| 354 | targets = { | 360 | targets = { |
| 355 | "munin" = { | 361 | "munin" = { |
| 356 | repo = "borg.munin:borg"; | 362 | repo = "borg.munin:borg"; |
| 357 | paths = [ { VG = "nvm"; LV = "home"; } ]; | 363 | paths = [ "/home/gkleen" ]; |
| 358 | prune = { | 364 | prune = { |
| 359 | "home" = | 365 | "home" = |
| 360 | [ "--keep-within" "24H" | 366 | [ "--keep-within" "24H" |